's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ; \
rm -rf $$NAME ; ln -s . $$NAME ; \
FILES= ; \
+ ADIR=archive/ ; \
for subdir in $(SUBDIRS) ; do \
d=`pwd` ; \
cd $$subdir ; \
| sed \"s|^|$$subdir/|g;s| | $$subdir/|g\" \
` "; \
cd $$d ; done ; \
- echo creating tar file $${NAME}.tar.gz... ; \
- GZIP="-9v" $(TAR) -vchzf $${NAME}.tar.gz \
+ echo creating tar file $$ADIR$$NAME.tar.gz... ; \
+ GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz \
`echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ; \
rm $$NAME
NEW=`echo $$MINOR + 1 | bc` ; \
NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ; \
D=`date '+%d-%b-%Y'`; \
- if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then \
- echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist."; \
+ ADIR=archive/ ; \
+ if [ ! -f $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then \
+ echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";\
fi ; \
- if [ -f xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \
- echo "WARNING: xscreensaver-$$MAJOR.$$NEW.tar.gz already exists."; \
+ if [ -f $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \
+ echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz already exists.";\
fi ; \
echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? "; \
read line; \
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 ; \
+ DIR=`pwd`/rpm_build ; \
+ ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ; \
+ ADIR=archive/ ; \
+ TGZ=xscreensaver-$$VERS.tar.gz ; \
+ if [ ! -f $${ADIR}$$TGZ ]; then \
+ echo "$${ADIR}$$TGZ does not exist! Did you forget to \`make tar'?" ; \
+ exit 1 ; \
+ fi ; \
+ rm -rf /var/tmp/xscreensaver-$$VERS-root ; \
+ rm -rf $$DIR ; \
+ mkdir $$DIR ; \
+ ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ; \
+ cp -p $${ADIR}$$TGZ $$DIR/SOURCES/ ; \
+ rpm --define "_topdir $$DIR" \
+ --define "USE_GL yes" \
+ -v -ba xscreensaver.spec ; \
+ echo '' ; \
+ echo 'RPM build complete' ; \
+ echo '' ; \
+ rm -f $$DIR/$$TGZ ; \
rm -rf $$DIR/BUILD/xscreensaver-$$VERS ; \
mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ; \
- mv $$DIR/RPMS/i386/xscreensaver*-$$VERS-*.rpm . ; \
+ mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ; \
+ rm -rf $$DIR ; \
echo '' ; \
ls -lFG xscreensaver*-$$VERS-*.rpm
@ \
VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
D=xscreensaver-$$VERS ; \
- NAME="$$D.tar.gz" ; \
+ ADIR=archive/ ; \
+ NAME="$${ADIR}$$D.tar.gz" ; \
if [ ! -f $$NAME ]; then \
echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \
exit 1 ; \
chmod -R u+w $$D ; \
fi ; \
rm -rf $$D ; \
- zcat $$D.tar.gz | tar -xf - ; \
+ zcat $${ADIR}$$D.tar.gz | tar -xf - ; \
cd $$D ; \
chmod -R a-w . ; \
chmod u+w . ; \
DEST=$$HOME/www/xscreensaver ; \
VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
HEAD="xscreensaver-$$VERS" ; \
- NAME="$$HEAD.tar.gz" ; \
+ ADIR=archive/ ; \
+ BNAME="$$HEAD.tar.gz" ; \
+ NAME="$$ADIR$$BNAME" ; \
+ DNAME="$$DEST/$$HEAD.tar.gz" ; \
\
if [ ! -f $$NAME ]; then \
echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \
exit 1 ; \
fi ; \
chmod a-w $$NAME ; \
- if [ -f $$DEST/$$NAME ]; then \
- echo -n "WARNING: $$DEST/$$NAME already exists! Overwrite? "; \
+ if [ -f $$DNAME ]; then \
+ echo -n "WARNING: $$DNAME already exists! Overwrite? "; \
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
fi ; \
- cp -p $$NAME $$DEST/$$NAME ; \
- chmod u+w $$DEST/$$NAME ; \
+ cp -p $$NAME $$DNAME ; \
+ chmod u+w $$DNAME ; \
cd $$DEST ; \
\
TMP=/tmp/xd.$$$$ ; \
else \
set -x ; \
fi ; \
- cvs add -kb $$NAME ; \
+ cvs add -kb $$BNAME ; \
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\