[or-cvs] rpmbuild doesn"t like changes between versions. Assume tar...

[phobos at seul.org]

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

Modified Files:
      Tag: tor-0_1_1-patches
	Makefile.am tor.spec.in 
Log Message:
rpmbuild doesn't like changes between versions.  Assume tarball is one directory up from where we are trying to build tor rpms right now.


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -p -d -r1.22.2.1 -r1.22.2.2
--- Makefile.am	14 Apr 2006 20:24:10 -0000	1.22.2.1
+++ Makefile.am	3 May 2006 19:59:58 -0000	1.22.2.2
@@ -22,8 +22,7 @@ dist-rpm: 
 	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;       \
+	cp ./../tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES;       \
 	rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR"	tor.spec; \
 	mv $$RPM_BUILD_DIR/SRPMS/* .;                           \
 	mv $$RPM_BUILD_DIR/RPMS/* .;				\

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