[bitlbee] - Enable forkdaemon due lacking SELinux policy in Rawhide only - Disable libpurple conflicting with
Robert Scheck
robert at fedoraproject.org
Mon Jul 14 20:06:55 UTC 2014
commit cbc7905805b7accd7c0cbf5215f4b34cfe285208
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Jul 14 22:07:11 2014 +0200
- Enable forkdaemon due lacking SELinux policy in Rawhide only
- Disable libpurple conflicting with the daemon mode (#1117553)
bitlbee.spec | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/bitlbee.spec b/bitlbee.spec
index f3bdfe1..7eb7745 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -10,7 +10,11 @@
%bcond_with systemd
%endif
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 5
+# libpurple requires forkdaemon or inetd mode, however forkdaemon needs
+# adapted SELinux policy, thus enable it only on Rawhide for now to get
+# a new policy developed. Switch from forkdaemon to daemon happens with
+# patch 4 that is only applied to non-Rawhide.
+%if 0%{?fedora} >= 22 || 0%{?rhel} < 7
# EL-5 ppc doesn't ship libpurple
%if 0%{?rhel} == 5
%ifarch ppc
@@ -28,7 +32,7 @@
Summary: IRC to other chat networks gateway
Name: bitlbee
Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
URL: http://www.bitlbee.org/
@@ -48,6 +52,8 @@ Patch3: bitlbee-forkdaemon.patch
Patch4: bitlbee-systemd.patch
# Patch suggested to upstream via http://bugs.bitlbee.org/bitlbee/ticket/1162
Patch5: bitlbee-3.2.2-no-root.patch
+# Future upstream patch, see http://bugs.bitlbee.org/bitlbee/ticket/785
+Patch6: bitlbee-3.2.2-nss-forkdaemon.patch
Requires(pre): shadow-utils
%if 0%{?rhel} == 5
@@ -110,10 +116,14 @@ echo With systemd %with_systemd
%if %{with systemd}
%patch3 -p1
+%if 0%{?fedora} < 22
%patch4 -p1
+%endif
%patch5 -p1
%endif
+%patch6 -p1
+
%build
# Note that we cannot use openssl in Fedora packages ... it breaks GPL
CFLAGS="$RPM_OPT_FLAGS" ./configure \
@@ -257,6 +267,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jul 14 2014 Robert Scheck <robert at fedoraproject.org> 3.2.2-2
+- Enable forkdaemon due lacking SELinux policy in Rawhide only
+- Disable libpurple conflicting with the daemon mode (#1117553)
+
* Sun Jul 06 2014 Robert Scheck <robert at fedoraproject.org> 3.2.2-1
- Upgrade to 3.2.2 (#1116567)
- Enable libpurple support additionally to built-in protocols
More information about the scm-commits
mailing list