[or-cvs] Temporary hacks to ensure make dist-rpm works from cvs unti...

[phobos at seul.org]

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

Modified Files:
	Makefile.am tor.spec.in 
Log Message:
Temporary hacks to ensure make dist-rpm works from cvs until a better
solution can be found.


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- Makefile.am	10 Apr 2006 14:12:29 -0000	1.23
+++ Makefile.am	13 Apr 2006 01:46:27 -0000	1.24
@@ -23,7 +23,8 @@ dist-rpm: 
 	for subdir in BUILD RPMS SOURCES SPECS SRPMS; do        \
 	    mkdir $$RPM_BUILD_DIR/$$subdir;                     \
 	done;                                                   \
-	cp ../tor-$(VERSION).tar.gz $$RPM_BUILD_DIR/SOURCES;       \
+	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/* .;                           \
 	mv $$RPM_BUILD_DIR/RPMS/* .;				\

Index: tor.spec.in
===================================================================
RCS file: /home/or/cvsroot/tor/tor.spec.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -d -r1.31 -r1.32
--- tor.spec.in	28 Mar 2006 16:54:29 -0000	1.31
+++ tor.spec.in	13 Apr 2006 01:46:27 -0000	1.32
@@ -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} \