[or-cvs] Backport dist-rpm changes so rpms can be built without erro...

[phobos@xxxxxxxx]

Update of /home/or/cvsroot/tor
In directory moria:/tmp/cvs-serv28395

Modified Files:
      Tag: tor-0_1_1-patches
	Makefile.am tor.spec.in 
Log Message:
Backport dist-rpm changes so rpms can be built without errors.


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -p -d -r1.22 -r1.22.2.1
--- Makefile.am	16 Feb 2006 22:00:46 -0000	1.22
+++ Makefile.am	14 Apr 2006 20:24:10 -0000	1.22.2.1
@@ -15,13 +15,14 @@ EXTRA_DIST = INSTALL README AUTHORS LICE
 #install-data-local:
 #	$(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor
 
-dist-rpm: dist
+dist-rpm: 
 	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;                                                   \
+	tar zcf tor-$(VERSION).tar.gz ../tor;                   \
 	cp tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES;       \
 	rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR"	tor.spec; \
 	mv $$RPM_BUILD_DIR/SRPMS/* .;                           \

Index: tor.spec.in
===================================================================
RCS file: /home/or/cvsroot/tor/tor.spec.in,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -p -d -r1.31 -r1.31.2.1
--- tor.spec.in	28 Mar 2006 16:54:29 -0000	1.31
+++ tor.spec.in	14 Apr 2006 20:24:10 -0000	1.31.2.1
@@ -163,7 +163,8 @@ strength of the anonymity provided. Tor 
 for high-stakes anonymity.
 
 %prep
-%setup -q -n %{name}-%{native_version}
+#%setup -q -n %{name}-%{native_version}
+%setup -q -n %{name}
 
 %build
 %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \