1.1 --- a/test/Makefile.am	Thu Jul 09 00:01:18 2009 +0100
     1.2 +++ b/test/Makefile.am	Mon Sep 28 17:36:02 2009 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  ## Process this file with automake to produce Makefile.in
     1.5  
     1.6 -check_SCRIPTS = relocate named-root remove
     1.7 +check_SCRIPTS = relocate named-root remove update
     1.8  if HAVE_LUA
     1.9    check_SCRIPTS += lua
    1.10  endif
    1.11 @@ -15,25 +15,44 @@
    1.12  remove:	remove.sh primary.xml.gz
    1.13  	cp $(srcdir)/remove.sh remove
    1.14  
    1.15 +update:	update.sh base/repodata/primary.xml.gz updates/repodata/primary.xml.gz
    1.16 +	cp $(srcdir)/update.sh update
    1.17 +
    1.18  order:	order.sh primary.xml.gz
    1.19  	cp $(srcdir)/order.sh order
    1.20  
    1.21  lua:	lua.sh primary.xml.gz
    1.22  	cp $(srcdir)/lua.sh lua
    1.23  
    1.24 -primary.xml.gz:	zsh.spec zsh2.spec zip.spec zap.spec filesystem.spec Makefile
    1.25 -	rm -rf rpmbuild rpms repodata
    1.26 +base/repodata/primary.xml.gz:	zsh.spec zsh2.spec zip.spec zap.spec \
    1.27 +		filesystem.spec Makefile
    1.28 +	rm -rf rpmbuild base
    1.29  	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
    1.30  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zap.spec
    1.31 -	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zip.spec
    1.32 +	rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version 1" \
    1.33 +	  -bb $(srcdir)/zip.spec
    1.34  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh.spec
    1.35  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh2.spec
    1.36  	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/filesystem.spec
    1.37 -	mkdir rpms
    1.38 -	mv rpmbuild/RPMS/noarch/*.rpm rpms
    1.39 +	mkdir -p base/rpms
    1.40 +	mv rpmbuild/RPMS/noarch/*.rpm base/rpms
    1.41  	rm -rf rpmbuild
    1.42 -	createrepo -o . rpms
    1.43 -	cp repodata/primary.xml.gz repodata/filelists.xml.gz .
    1.44 +	createrepo -o base base/rpms
    1.45 +
    1.46 +updates/repodata/primary.xml.gz:	zip.spec Makefile
    1.47 +	rm -rf rpmbuild updates
    1.48 +	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
    1.49 +	rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version 2" \
    1.50 +	  -bb $(srcdir)/zip.spec
    1.51 +	mkdir -p updates/rpms
    1.52 +	mv rpmbuild/RPMS/noarch/*.rpm updates/rpms
    1.53 +	rm -rf rpmbuild
    1.54 +	createrepo -o updates updates/rpms
    1.55 +
    1.56 +primary.xml.gz:	base/repodata/primary.xml.gz
    1.57 +	cp base/repodata/primary.xml.gz base/repodata/filelists.xml.gz .
    1.58 +	rm -rf rpms
    1.59 +	ln -s base/rpms .
    1.60  
    1.61  TESTS = $(check_SCRIPTS)
    1.62  
    1.63 @@ -46,6 +65,7 @@
    1.64  	order.sh		\
    1.65  	lua.sh			\
    1.66  	remove.sh		\
    1.67 +	update.sh		\
    1.68  	named-root.sh		\
    1.69  	relocate.sh
    1.70  
    1.71 @@ -57,5 +77,4 @@
    1.72  
    1.73  clean-local :
    1.74  	rm -f *~
    1.75 -	rm -rf repodata rpms
    1.76 -
    1.77 +	rm -rf repodata rpms base updates