[or-cvs] Reworked dist-rpm in order to duplicate what dist used to d...
phobos at seul.org
phobos at seul.org
Thu May 4 00:34:54 UTC 2006
Update of /home/or/cvsroot/tor
In directory moria:/tmp/cvs-serv30947
Modified Files:
Makefile.am tor.spec.in
Log Message:
Reworked dist-rpm in order to duplicate what dist used to do, but don't actually require dist.
Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- Makefile.am 13 Apr 2006 01:46:27 -0000 1.24
+++ Makefile.am 4 May 2006 00:34:51 -0000 1.25
@@ -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 \
Index: tor.spec.in
===================================================================
RCS file: /home/or/cvsroot/tor/tor.spec.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -d -r1.32 -r1.33
--- tor.spec.in 13 Apr 2006 01:46:27 -0000 1.32
+++ tor.spec.in 4 May 2006 00:34:51 -0000 1.33
@@ -163,8 +163,7 @@ strength of the anonymity provided. Tor
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} \
More information about the tor-commits
mailing list