diff -r ee438b1e94c0 -r 3d3fab314c4e test/Makefile.am
--- a/test/Makefile.am	Thu Jul 09 00:01:18 2009 +0100
+++ b/test/Makefile.am	Mon Sep 28 17:37:12 2009 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-check_SCRIPTS = relocate named-root remove
+check_SCRIPTS = relocate named-root remove update
 if HAVE_LUA
   check_SCRIPTS += lua
 endif
@@ -15,25 +15,44 @@
 remove:	remove.sh primary.xml.gz
 	cp $(srcdir)/remove.sh remove
 
+update:	update.sh base/repodata/primary.xml.gz updates/repodata/primary.xml.gz
+	cp $(srcdir)/update.sh update
+
 order:	order.sh primary.xml.gz
 	cp $(srcdir)/order.sh order
 
 lua:	lua.sh primary.xml.gz
 	cp $(srcdir)/lua.sh lua
 
-primary.xml.gz:	zsh.spec zsh2.spec zip.spec zap.spec filesystem.spec Makefile
-	rm -rf rpmbuild rpms repodata
+base/repodata/primary.xml.gz:	zsh.spec zsh2.spec zip.spec zap.spec \
+		filesystem.spec Makefile
+	rm -rf rpmbuild base
 	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zap.spec
-	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zip.spec
+	rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version 1" \
+	  -bb $(srcdir)/zip.spec
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh.spec
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh2.spec
 	rpmbuild --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/filesystem.spec
-	mkdir rpms
-	mv rpmbuild/RPMS/noarch/*.rpm rpms
+	mkdir -p base/rpms
+	mv rpmbuild/RPMS/noarch/*.rpm base/rpms
 	rm -rf rpmbuild
-	createrepo -o . rpms
-	cp repodata/primary.xml.gz repodata/filelists.xml.gz .
+	createrepo -o base base/rpms
+
+updates/repodata/primary.xml.gz:	zip.spec Makefile
+	rm -rf rpmbuild updates
+	mkdir -p rpmbuild/BUILD rpmbuild/RPMS
+	rpmbuild --define "_topdir `pwd`/rpmbuild" --define "_version 2" \
+	  -bb $(srcdir)/zip.spec
+	mkdir -p updates/rpms
+	mv rpmbuild/RPMS/noarch/*.rpm updates/rpms
+	rm -rf rpmbuild
+	createrepo -o updates updates/rpms
+
+primary.xml.gz:	base/repodata/primary.xml.gz
+	cp base/repodata/primary.xml.gz base/repodata/filelists.xml.gz .
+	rm -rf rpms
+	ln -s base/rpms .
 
 TESTS = $(check_SCRIPTS)
 
@@ -46,6 +65,7 @@
 	order.sh		\
 	lua.sh			\
 	remove.sh		\
+	update.sh		\
 	named-root.sh		\
 	relocate.sh
 
@@ -57,5 +77,4 @@
 
 clean-local :
 	rm -f *~
-	rm -rf repodata rpms
-
+	rm -rf repodata rpms base updates