summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--tor.spec.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cd4dbc398b..25215a912b 100644
--- a/Makefile.am
+++ b/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/* .; \
diff --git a/tor.spec.in b/tor.spec.in
index 0fc267fd8a..ceb34668ec 100644
--- a/tor.spec.in
+++ b/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} \