http://packetstormsecurity.org/UNIX/admin/xscreensaver-3.31.tar.gz

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 00a5d99d389b004972cd77624be251c89281547b..d33dc24b35758fd3776f79e874e66754d418ac15 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,10 +13,6 @@ TARFILES     = README README.VMS README.debugging INSTALL xscreensaver.lsm \
                  config.sub makevms.com screenblank.txt \
                  xscreensaver.lsm.sh xscreensaver.spec
 TAR            = tar
-COMPRESS       = gzip --verbose --best
-COMPRESS_EXT   = gz
-# COMPRESS     = compress
-# COMPRESS_EXT = Z
 
 MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
 
@@ -75,10 +71,9 @@ tar:
       | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\"                           \
       ` ";                                                                 \
     cd $$d ; done ;                                                        \
-  echo creating tar file $${NAME}.tar.$(COMPRESS_EXT)... ;                 \
-  $(TAR) -vchf -                                                           \
-    `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" `      \
-   | $(COMPRESS) > $${NAME}.tar.$(COMPRESS_EXT) ;                          \
+  echo creating tar file $${NAME}.tar.gz... ;                              \
+  GZIP="-9v" $(TAR) -vchzf $${NAME}.tar.gz                                 \
+    `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;            \
   rm $$NAME
 
 
@@ -131,7 +126,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 +156,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 +167,26 @@ 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=`pwd`/rpm_build ;                                                           \
+  ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ;                           \
+  rm -rf $$DIR ;                                                          \
+  mkdir $$DIR ;                                                                   \
+  ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ;        \
+  cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;                       \
+  rpm -vba --define "_topdir $$DIR"                                       \
+           --define "USE_GL yes" xscreensaver.spec ;                      \
+  echo '' ;                                                               \
+  echo 'RPM build complete' ;                                             \
+  echo '' ;                                                               \
+  rm -f $$DIR/xscreensaver-$$VERS.tar.gz ;                                \
+  rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;                                \
+  mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ;                                   \
+  mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ;                     \
+  rm -rf $$DIR ;                                                          \
+  echo '' ;                                                               \
+  ls -lFG xscreensaver*-$$VERS-*.rpm
 
 test-tar::
        @                                                                   \
@@ -223,7 +227,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 ) ;                                             \