diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-05-04 00:34:51 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-05-04 00:34:51 +0000 |
| commit | 1fcc12ffff5a4b43db9ca0352d809c5cc9fc9e2e (patch) | |
| tree | fb87945622cfb36b610ac41ac253d47d77ad41d9 | |
| parent | f1dad00bd34ffa6a070345aa6134bc69b14095da (diff) | |
| download | tor-1fcc12ffff5a4b43db9ca0352d809c5cc9fc9e2e.tar.gz tor-1fcc12ffff5a4b43db9ca0352d809c5cc9fc9e2e.zip | |
Reworked dist-rpm in order to duplicate what dist used to do, but don't actually require dist.
svn:r6437
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | tor.spec.in | 3 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 25215a912b..e41d6ebb95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,12 +23,16 @@ 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; \ - rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ - mv $$RPM_BUILD_DIR/SRPMS/* .; \ - mv $$RPM_BUILD_DIR/RPMS/* .; \ - rm -rf $$RPM_BUILD_DIR + mkdir $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION); \ + cp -R ./ $$RPM_BUILD_DIR/SOURCES/tor-$(VERSION)/; \ + pushd $$RPM_BUILD_DIR/SOURCES/; \ + tar zcf tor-$(VERSION).tar.gz ./; \ + popd; \ + rpmbuild -ba --define "_topdir $$RPM_BUILD_DIR" tor.spec; \ + mv $$RPM_BUILD_DIR/SRPMS/* .; \ + mv $$RPM_BUILD_DIR/RPMS/* .; \ + rm -rf $$RPM_BUILD_DIR + dist-osx: @if [ "x$(prefix)" != 'x/Library/Tor' ]; then \ diff --git a/tor.spec.in b/tor.spec.in index ceb34668ec..0fc267fd8a 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -163,8 +163,7 @@ 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} +%setup -q -n %{name}-%{native_version} %build %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \ |