X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=5cc087cb64bb3d2100b2fa56dc6dbf220c88bd24;hb=93f25dc6827112d98b8b855ea85c8f5eb8123086;hp=00a5d99d389b004972cd77624be251c89281547b;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index 00a5d99d..5cc087cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,7 +131,7 @@ bump-version::
   MAJOR="$$1"; MINOR="$$2";						    \
   NEW=`echo $$MINOR + 1 | bc` ;						    \
   NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ;			    \
-  D=`date '+%d-%b-%y'`;							    \
+  D=`date '+%d-%b-%Y'`;							    \
   if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then			    \
     echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";    \
   fi ;									    \
@@ -161,7 +161,7 @@ update_spec_version::
 	V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ;		    \
 	echo -n "Updating version number in $$S to \"$$V\"... " ;	    \
 	T=/tmp/xs.$$$$ ;						    \
-	sed "s/^\(Version:[^0-9]*\)\(.*\)/\1$$V/"			    \
+	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/"		    \
 	  < $$S > $$T ;							    \
 	if cmp -s $$S $$T ; then					    \
 	  echo "unchanged." ;						    \
@@ -172,17 +172,17 @@ update_spec_version::
 	rm $$T
 
 rpm::
-	@								    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
-  DIR=/usr/src/redhat ;							    \
-  cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;			    \
-  rpm -ba xscreensaver.spec ;						    \
-  rm -f $$DIR/xscreensaver-$$VERS.tar.gz ;				    \
-  rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;				    \
-  mv $$DIR/RPMS/i386/xscreensaver-$$VERS-*.rpm . ;			    \
-  mv $$DIR/SRPMS/xscreensaver-$$VERS-*.rpm . ;				    \
-  echo '' ;								    \
-  ls -lFG xscreensaver-$$VERS-*.rpm
+	@								   \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
+  DIR=/usr/src/redhat ;							   \
+  cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;			   \
+  rpm --define "USE_GL yes" -ba xscreensaver.spec ;			   \
+  rm -f $$DIR/xscreensaver-$$VERS.tar.gz ;				   \
+  rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;				   \
+  mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ;				   \
+  mv $$DIR/RPMS/i386/xscreensaver*-$$VERS-*.rpm . ;			   \
+  echo '' ;								   \
+  ls -lFG xscreensaver*-$$VERS-*.rpm
 
 test-tar::
 	@								    \
@@ -223,7 +223,7 @@ test-tar::
   ( cd BIN/lesstif ;							    \
     CC=cc ;								    \
     export CC ;								    \
-    ../../configure --with-motif=/usr/local/lesstif ;			    \
+    ../../configure --with-motif=/usr/local/lesstif --without-gnome ;	    \
     echo --------------------------------------------------------------- ;  \
     ( cd utils; gmake all ) ;						    \
     ( cd driver; gmake all ) ;						    \