Temporary hacks to ensure make dist-rpm works from cvs until a better

solution can be found.


svn:r6383

Makefile.am

@@ -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/* .;				\

tor.spec.in

@@ -163,7 +163,8 @@ strength of the anonymity provided. Tor is not presently suitable
 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} \