mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-30 10:52:31 +00:00 
			
		
		
		
	Revert "Undefine the release number so that the spec files will continue"
This reverts commit 505a1c0556.
			
			
This commit is contained in:
		
							
								
								
									
										8
									
								
								makerpm
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								makerpm
									
									
									
									
									
								
							| @@ -55,7 +55,7 @@ function makenoarch { | ||||
|  | ||||
| 		tar --exclude .svn -czf $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz $RPMNAME | ||||
| 		rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm | ||||
| 		rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz --define "version $VER" | ||||
| 		rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz --define "version $VER" $REL "$EASE" | ||||
| 		RC=$? | ||||
|  | ||||
| 		if [ $RPMNAME = "xCAT-UI" ]; then | ||||
| @@ -137,7 +137,7 @@ function makexcat { | ||||
|  | ||||
| 		rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/$ARCH/$RPMNAME-$VER*rpm | ||||
| 		echo "Building $RPMROOT/RPMS/$ARCH/$RPMNAME-$VER-snap*.$ARCH.rpm $EMBEDTXT..." | ||||
| 		rpmbuild $QUIET -ba $RPMNAME/$RPMNAME.spec $TARGET --define "version $VER" | ||||
| 		rpmbuild $QUIET -ba $RPMNAME/$RPMNAME.spec $TARGET --define "version $VER" $REL "$EASE" | ||||
| 		RC=$? | ||||
| 	fi | ||||
| } | ||||
| @@ -170,7 +170,7 @@ function makegenesis { | ||||
| 	cd - >/dev/null | ||||
| 	rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm | ||||
| 	echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..." | ||||
| 	rpmbuild $QUIET -ba $DIR/$RPMNAME.spec --define "version $VER"  | ||||
| 	rpmbuild $QUIET -ba $DIR/$RPMNAME.spec --define "version $VER" $REL "$EASE" | ||||
| } | ||||
|  | ||||
| function makegenesisscripts { | ||||
| @@ -190,7 +190,7 @@ function makegenesisscripts { | ||||
| 	cd - >/dev/null | ||||
| 	rm -f $RPMROOT/SRPMS/$RPMNAME-$ARCH-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$ARCH-$VER*rpm | ||||
| 	echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$ARCH-$VER-snap*.noarch.rpm $EMBEDTXT..." | ||||
| 	rpmbuild $QUIET -ba $DIR/$RPMNAME.spec $TARGET --define "version $VER"  | ||||
| 	rpmbuild $QUIET -ba $DIR/$RPMNAME.spec $TARGET --define "version $VER" $REL "$EASE" | ||||
| } | ||||
|  | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user