commit eeb81b5bb1135c1b85fff68da823c10fc4a99965 Author: Ondrej Mikle ondrej.mikle@gmail.com Date: Thu Jun 21 18:26:05 2012 +0200

Fixes/beautification of RPM spec. Tiny improvements in RPM build docs. --- doc/tor-rpm-creation.txt | 6 ++++-- tor.spec.in | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt index a88f2e8..a03891e 100644 --- a/doc/tor-rpm-creation.txt +++ b/doc/tor-rpm-creation.txt @@ -14,14 +14,16 @@ LIBS=-lrt ./configure 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. +(i686|x86_64).rpm, a src.rpm, and on redhat/centos machines, a debuginfo.rpm. +The debuginfo rpms are created if package redhat-rpm-config is installed (case +of redhat distros).

This step suffices unless you want to create RPMs for distros other than the one you used for building.

## Instructions for building RPMs for multiple architectures or distributions -## using 'mock' +## using 'mock' on Fedora or RHEL (and clones)

Make sure you have mock installed and configured, see following HOWTOs for setup: https://fedoraproject.org/wiki/How_to_create_an_RPM_package diff --git a/tor.spec.in b/tor.spec.in index 5605586..b452c9b 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -6,7 +6,7 @@ # This should be incremented whenever the spec file changes, but # can drop back to zero at a new Tor version

-%define specver 0 +%define specver 1

## Things users may want to change # @@ -108,17 +108,14 @@ License: 3-clause BSD Vendor: The Tor Project (https://torproject.org) Packager: Erinn Clark erinn@torproject.org

-%if %{is_suse} -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, 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 + +# Fedora 16 and RHEL 5 have following conflicting packages according to rpm search +%if %{is_rh} Conflicts: tor-core, tor-lsb, tor-upstart %endif + Requires(pre): /usr/bin/id, /bin/date, /bin/sh Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd

@@ -287,6 +284,14 @@ exit 0 %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name}

%changelog +* Thu Jun 21 2012 Ondrej Mikle ondrej.mikle@gmail.com +- fixed to work with both rpmbuild and mock on RHEL/Fedora +- removed unnecessary files from rpm such as .git repo +- fixed build dependencies and package conflicts +- fixed creating _tor user on Fedora 17 (ancient typo) +- added/updated build instructions for RPM creation +- confirmed to build and run on EL5, EL6, Fedora 16/17, OpenSuse 12.1 + * Fri Aug 20 2010 Erinn Clark erinn@torproject.org - add conflicts for Fedora packages - add logic for SuSE since it requires special doc handling