diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-04-14 20:24:10 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-04-14 20:24:10 +0000 |
| commit | 78b407b486d4e70367673e6c584b56509a5c5aff (patch) | |
| tree | ae0cbad380d1bce2d970b44543641881f950e58d | |
| parent | 0c1ad47e9e504b8ea8af2c19b51f970f7e5a87a3 (diff) | |
| download | tor-78b407b486d4e70367673e6c584b56509a5c5aff.tar.gz tor-78b407b486d4e70367673e6c584b56509a5c5aff.zip | |
Backport dist-rpm changes so rpms can be built without errors.
svn:r6386
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | tor.spec.in | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 809e26770f..118920006a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,13 +15,14 @@ EXTRA_DIST = INSTALL README AUTHORS LICENSE ChangeLog tor.spec tor.spec.in #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor -dist-rpm: dist +dist-rpm: RPM_BUILD_DIR="/tmp/tor-rpm-build-$$$$"; \ rm -rf $$RPM_BUILD_DIR; \ mkdir $$RPM_BUILD_DIR || exit 1; \ 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/* .; \ 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} \ |