commit 58c8fd6a267be86609027740b220268498c315ac
Author: Jakub Bogusz <[email protected]>
Date: Mon Oct 26 20:15:51 2015 +0100
- added libdir patch (use pkg-config for arch-specific dbus and glib
includes detection, fixes x32 build)
- release 2
policycoreutils-libdir.patch | 16 ++++++++++++++++
policycoreutils.spec | 7 ++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 5ec07f5..0bcf60b 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -10,7 +10,7 @@ Summary: SELinux policy core utilities
Summary(pl.UTF-8): Podstawowe narzędzia dla polityki SELinux
Name: policycoreutils
Version: 2.4
-Release: 1
+Release: 2
# some parts strictly v2, some v2+
License: GPL v2
Group: Applications/System
@@ -19,15 +19,19 @@ Source0:
https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
# Source0-md5: 795b05c3ad58253cba61249ec65b28ef
Source1: %{name}-newrole.pamd
Source2: %{name}-run_init.pamd
+Patch0: %{name}-libdir.patch
URL: https://github.com/SELinuxProject/selinux/wiki
BuildRequires: audit-libs-devel
+%{?with_restorecond:BuildRequires: dbus-devel >= 1.0}
BuildRequires: gettext-tools
+%{?with_restorecond:BuildRequires: glib2-devel >= 2.0}
%{?with_restorecond:BuildRequires: glibc-devel >= 6:2.4}
BuildRequires: libcap-ng-devel
BuildRequires: libcgroup-devel
BuildRequires: libselinux-devel >= 2.4
BuildRequires: libsemanage-devel >= 2.4
BuildRequires: libsepol-static >= 2.4
+%{?with_restorecond:BuildRequires: pkgconfig}
BuildRequires: pam-devel
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
@@ -167,6 +171,7 @@ konfiguracją SELinuksa.
%prep
%setup -q
+%patch0 -p1
%{!?with_restorecond:sed -i 's/restorecond//' Makefile}
diff --git a/policycoreutils-libdir.patch b/policycoreutils-libdir.patch
new file mode 100644
index 0000000..b13391c
--- /dev/null
+++ b/policycoreutils-libdir.patch
@@ -0,0 +1,16 @@
+--- policycoreutils-2.4/restorecond/Makefile.orig 2015-02-02
15:38:10.000000000 +0100
++++ policycoreutils-2.4/restorecond/Makefile 2015-10-26 19:30:14.953486038
+0100
+@@ -11,11 +11,11 @@
+ INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
+ SELINUXDIR = $(DESTDIR)/etc/selinux
+
+-DBUSFLAGS = -DHAVE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include
-I/usr/lib/dbus-1.0/include
++DBUSFLAGS = -DHAVE_DBUS $(shell pkg-config --cflags dbus-1)
+ DBUSLIB = -ldbus-glib-1 -ldbus-1
+
+ CFLAGS ?= -g -Werror -Wall -W
+-override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I/usr/include/glib-2.0
-I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include
++override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) $(shell pkg-config
--cflags glib-2.0)
+
+ LDLIBS += -lselinux $(DBUSLIB) -lglib-2.0 -L$(LIBDIR)
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/policycoreutils.git/commitdiff/58c8fd6a267be86609027740b220268498c315ac
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
