Modify the version determining stuff to work with bzr, update the

toplevel tarball make target to create a release tarball and make a
snapshot target to do the same thing for snapshot releases.

Makefile

@@ -17,22 +17,35 @@ DIRS=parser \
      common \
      tests
 
-RELEASE_DIR=apparmor-${VERSION}-${REPO_VERSION}
+#REPO_URL=lp:apparmor/2.5
+REPO_URL="bzr+ssh://bazaar.launchpad.net/~sbeattie/apparmor/apparmor-2.5.1-nominations/"
+
+RELEASE_DIR=apparmor-${VERSION}
+SNAPSHOT_DIR=apparmor-${VERSION}-${REPO_VERSION}
 
 .PHONY: tarball
-tarball: _dist
+tarball: clean
+	make export_dir __EXPORT_DIR=${RELEASE_DIR}
+	make setup __SETUP_DIR=${RELEASE_DIR}
 	tar cvzf ${RELEASE_DIR}.tar.gz ${RELEASE_DIR}
 
-${RELEASE_DIR}:
-	mkdir ${RELEASE_DIR}
+.PHONY: snapshot
+snapshot: clean
+	make export_dir __EXPORT_DIR=${SNAPSHOT_DIR}
+	make setup __SETUP_DIR=${SNAPSHOT_DIR}
+	tar cvzf ${SNAPSHOT_DIR}.tar.gz ${SNAPSHOT_DIR}
 
-.PHONY: _dist
-.PHONY: ${DIRS}
+${SNAPSHOT_DIR}:
+	mkdir ${SNAPSHOT_DIR}
 
-_dist: clean ${DIRS}
-	
-${DIRS}: ${RELEASE_DIR}
-	svn export -r $(REPO_VERSION) $(REPO_URL)/$@ $(RELEASE_DIR)/$@ ; \
+.PHONY: export_dir
+export_dir:
+	mkdir $(__EXPORT_DIR)
+	/usr/bin/bzr export -r $(REPO_VERSION) $(__EXPORT_DIR) $(REPO_URL)
+	echo "$(REPO_URL) $(REPO_VERSION)" > $(__EXPORT_DIR)/.stamp_rev
 
 clean:
 	-rm -rf ${RELEASE_DIR}
+
+setup:
+	cd $(__SETUP_DIR)/libraries/libapparmor && ./autogen.sh

common/Make.rules

@@ -75,8 +75,8 @@ RPMARG=--define "_topdir $(BUILDDIR:/=)" \
 #				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
 #			fi ; \
 #		      fi)
-REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
-				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
+REPO_VERSION=$(shell if [ -x /usr/bin/bzr ] ; then \
+				/usr/bin/bzr version-info . | awk '/^revno:/ { print $$2 }' ; \
 		      fi)
 REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \
 			/usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \
@@ -161,6 +161,11 @@ endif
 version:
 	 rpm -q --define "_sourcedir ." ${RPMARG} --specfile ${SPECFILE}
 
+.PHONY: repo_version
+.SILENT: repo_version
+repo_version:
+	 echo $(REPO_VERSION)
+
 .PHONY: build_dir 
 build_dir: $(BUILDRPMSUBDIRS)