commit cf20fac37f78cc1212eaf0dc5260eabf46bcea92 Author: Ondrej Mikle ondrej.mikle@gmail.com Date: Fri Jun 8 15:41:53 2012 +0200
Dependencies for RPM building with mock should work now --- doc/tor-rpm-creation.txt | 19 ++++++++++++++++++- tor.spec.in | 8 ++++---- 2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index 3fc6bde..eb22c22 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -3,7 +3,7 @@ The process used to create the official rpms is as follows:
Download latest stable libevent from -http://www.monkey.org/~provos/libevent/ +http://libevent.org/
The first step of compiling libevent is to configure it as follows: ./configure --enable-static --disable-shared @@ -24,3 +24,20 @@ make dist-rpm
You should have at least two, maybe three, rpms. There should be the binary i386.rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. + + +## Instructions for building RPMs for multiple architectures or distributions +## using 'mock' + +Make sure you have mock installed and configured, see following HOWTOs for setup: +https://fedoraproject.org/wiki/How_to_create_an_RPM_package +https://fedoraproject.org/wiki/Using_Mock_to_test_package_builds + +Take the source RPM generated by previous step, and execute mock for every +target architecture (the names come from files in /etc/mock, strip the .cfg +extension in the -r parameter): + +mock --rebuild -r fedora-17-x86_64 tor-X.Y.Z.src.rpm + +(Note: don't build under OpenVZ - it breaks unshare() syscall, which in turn +breaks mock. It could save you several hours.) diff --git a/tor.spec.in b/tor.spec.in index 25557b7..127bf36 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -109,11 +109,11 @@ Vendor: The Tor Project (https://torproject.org) Packager: Erinn Clark erinn@torproject.org
%if %{is_suse} -Requires: openssl >= 0.9.7 -BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel +Requires: openssl >= 0.9.7, libevent >= 1.4.13 +BuildRequires: openssl-devel >= 0.9.7, rpm >= 4.0, zlib-devel, libevent-devel >= 1.4.13, asciidoc %else -Requires: openssl >= 0.9.7 -BuildRequires: openssl-devel >= 0.9.7 +Requires: openssl >= 0.9.7, libevent >= 1.4.13 +BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc %endif %if %{is_fc} BuildRequires: rpm-build >= 4.0