[or-cvs] Forward-port last RPM change to mainline

[Nick Mathewson]

Update of /home/or/cvsroot/tor
In directory moria.mit.edu:/tmp/cvs-serv17212

Modified Files:
	Makefile.am tor.spec.in 
Log Message:
Forward-port last RPM change to mainline

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	9 Nov 2004 20:03:59 -0000	1.15
+++ Makefile.am	18 Dec 2004 23:04:55 -0000	1.16
@@ -11,16 +11,18 @@
 #	$(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor
 
 dist-rpm: dist
-	rm -rf /tmp/tor-rpm-build
-	mkdir /tmp/tor-rpm-build
-	for subdir in BUILD RPMS SOURCES SPECS SRPMS; do \
-	    mkdir /tmp/tor-rpm-build/$$subdir;		 \
-	done
-	cp tor-$(VERSION).tar.gz /tmp/tor-rpm-build/SOURCES
-	rpmbuild -ba --define '_topdir /tmp/tor-rpm-build' tor.spec
-	mv /tmp/tor-rpm-build/SRPMS/* .
-	mv /tmp/tor-rpm-build/RPMS/*/* .
-	rm -rf /tmp/tor-rpm-build
+	RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$";                \
+	rm -rf $$RPM_BUILD_DIR;                                 \
+	mkdir $$RPM_BUILD_DIR || exit 1;                        \
+	for subdir in BUILD RPMS SOURCES SPECS SRPMS; do        \
+	    mkdir $$RPM_BUILD_DIR/$$subdir;                     \
+	done;                                                   \
+	cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES;       \
+	rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR"		\
+	   $$RPMBUILD_OPTIONS tor.spec; 			\
+	mv $$RPM_BUILD_DIR/SRPMS/* .;                           \
+	mv $$RPM_BUILD_DIR/RPMS/*/* .;                          \
+	rm -rf $$RPM_BUILD_DIR
 
 doxygen:
 	doxygen && cd doc/doxygen/latex && make

Index: tor.spec.in
===================================================================
RCS file: /home/or/cvsroot/tor/tor.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tor.spec.in	18 Dec 2004 22:19:32 -0000	1.7
+++ tor.spec.in	18 Dec 2004 23:04:55 -0000	1.8
@@ -6,7 +6,7 @@
 # This should be incremented whenever the spec file changes, but
 # can drop back to zero at a new Tor version
 
-%define  specver 0
+%define specver 1
 
 ## Things users may want to change
 #
@@ -58,12 +58,18 @@
 %define ostag suse
 %endif
 
+
 # Using the build date ensures that every build really does get
-# a different release number.
-%define  blddate %(date -u +"%Y%m%d%H%M")
+# a different release number.  We use this trick for CVS versions.
+# For release versions, we don't want or need it.
+%define is_cvs_version %(echo %{native_version} | grep 'cvs' > /dev/null && echo 1 || echo 0)
 
-# ... and here it is.
+%if %{is_cvs_version}
+%define blddate %(date -u +"%Y%m%d%H%M")
 %define release %{pkgspec}.%{specver}.%{ostag}.%{blddate}
+%else
+%define release %{pkgspec}.%{specver}.%{ostag}
+%endif
 
 ## General-purpose macros
 #