nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:56:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes/beautification of RPM spec. Tiny improvements in RPM build docs.

Browse Source
This commit is contained in:
Ondrej Mikle 2012-06-21 18:26:05 +02:00 committed by Nick Mathewson
parent a7fc797edf
commit eeb81b5bb1
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/tor-rpm-creation.txt
View File

@ -14,14 +14,16 @@ LIBS=-lrt ./configure
make dist-rpm make dist-rpm
You should have at least two, maybe three, rpms. There should be the binary 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 This step suffices unless you want to create RPMs for distros other than the
one you used for building. one you used for building.
## Instructions for building RPMs for multiple architectures or distributions ## 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: 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/How_to_create_an_RPM_package

21
tor.spec.in
View File

@ -6,7 +6,7 @@
# This should be incremented whenever the spec file changes, but # This should be incremented whenever the spec file changes, but
# can drop back to zero at a new Tor version # can drop back to zero at a new Tor version
%define specver 0 %define specver 1
## Things users may want to change ## Things users may want to change
# #
@ -108,17 +108,14 @@ License: 3-clause BSD
Vendor: The Tor Project (https://torproject.org) Vendor: The Tor Project (https://torproject.org)
Packager: Erinn Clark <erinn@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 Requires: openssl >= 0.9.7, libevent >= 1.4.13
BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc BuildRequires: openssl-devel >= 0.9.7, libevent-devel >= 1.4.13, asciidoc
%endif
%if %{is_fc} # Fedora 16 and RHEL 5 have following conflicting packages according to rpm search
BuildRequires: rpm-build >= 4.0 %if %{is_rh}
Conflicts: tor-core, tor-lsb, tor-upstart Conflicts: tor-core, tor-lsb, tor-upstart
%endif %endif
Requires(pre): /usr/bin/id, /bin/date, /bin/sh Requires(pre): /usr/bin/id, /bin/date, /bin/sh
Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd
@ -287,6 +284,14 @@ exit 0
%attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name} %attr(0750,%{toruser},%{torgroup}) %dir %{_localstatedir}/log/%{name}
%changelog %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> * Fri Aug 20 2010 Erinn Clark <erinn@torproject.org>
- add conflicts for Fedora packages - add conflicts for Fedora packages
- add logic for SuSE since it requires special doc handling - add logic for SuSE since it requires special doc handling