commit be126f80ab59e82a6f79e8ce0add10af4cc2e4b9
Author: Jakub Bogusz <[email protected]>
Date: Sun Oct 25 16:45:13 2015 +0100
- new URLs, updated to 2.4
- added libexecdir patch to allow specifying LIBEXECDIR
libsemanage-libexecdir.patch | 30 ++++++++++++++++++++++++++++++
libsemanage.spec | 34 ++++++++++++++++++++++------------
2 files changed, 52 insertions(+), 12 deletions(-)
---
diff --git a/libsemanage.spec b/libsemanage.spec
index fb35fc9..370e703 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -1,25 +1,26 @@
Summary: An interface for SELinux management
Summary(pl.UTF-8): Interfejs do zarządzania SELinuksem
Name: libsemanage
-Version: 2.3
-Release: 2
+Version: 2.4
+Release: 1
License: LGPL v2.1+
Group: Libraries
-#git clone http://oss.tresys.com/git/selinux.git
-Source0:
http://userspace.selinuxproject.org/releases/current/%{name}-%{version}.tar.gz
-# Source0-md5: e564e2b92d18db35707060da29cddab9
-URL: http://userspace.selinuxproject.org/trac/wiki
+#Source0Download: https://github.com/SELinuxProject/selinux/wiki/Releases
+Source0:
https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/%{name}-%{version}.tar.gz
+# Source0-md5: cd551eb1cc5d20652660bda037972f0d
+Patch0: %{name}-libexecdir.patch
+URL: https://github.com/SELinuxProject/selinux/wiki
BuildRequires: bison
BuildRequires: bzip2-devel
BuildRequires: flex
-BuildRequires: libselinux-devel >= 2.3
-BuildRequires: libsepol-devel >= 2.3
+BuildRequires: libselinux-devel >= 2.4
+BuildRequires: libsepol-devel >= 2.4
BuildRequires: python-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: ustr-devel
-Requires: libselinux >= 2.3
-Requires: libsepol >= 2.3
+Requires: libselinux >= 2.4
+Requires: libsepol >= 2.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -57,6 +58,7 @@ Summary: Python binding for semanage library
Summary(pl.UTF-8): Wiązania Pythona do biblioteki semanage
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
+Requires: python-selinux >= 2.4
%pyrequires_eq python-libs
%description -n python-semanage
@@ -67,21 +69,27 @@ Wiązania Pythona do biblioteki semanage.
%prep
%setup -q
+%patch0 -p1
%build
%{__make} -j1 all pywrap \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -fno-strict-aliasing"
+ CFLAGS="%{rpmcflags} %{rpmcppflags} -Wall -fno-strict-aliasing" \
+ LIBEXECDIR=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install install-pywrap \
LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+ LIBEXECDIR=$RPM_BUILD_ROOT%{_libdir} \
SHLIBDIR=$RPM_BUILD_ROOT/%{_lib} \
DESTDIR=$RPM_BUILD_ROOT
-# make symlink across / absolute
+# changed in 2.4
+install -d $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libsemanage.so.* $RPM_BUILD_ROOT/%{_lib}
+# adjust .so symlink, make symlink across / absolute
ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libsemanage.so.*) \
$RPM_BUILD_ROOT%{_libdir}/libsemanage.so
@@ -101,6 +109,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /%{_lib}/libsemanage.so.*
%dir %{_sysconfdir}/selinux
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/selinux/semanage.conf
+%dir %{_libdir}/selinux
%{_mandir}/man5/semanage.conf.5*
%files devel
@@ -118,3 +127,4 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/_semanage.so
%{py_sitedir}/semanage.py[co]
+%attr(755,root,root) %{_libdir}/selinux/semanage_migrate_store
diff --git a/libsemanage-libexecdir.patch b/libsemanage-libexecdir.patch
new file mode 100644
index 0000000..868d4cc
--- /dev/null
+++ b/libsemanage-libexecdir.patch
@@ -0,0 +1,30 @@
+--- libsemanage-2.4/src/conf-parse.y.orig 2015-02-02 15:38:10.000000000
+0100
++++ libsemanage-2.4/src/conf-parse.y 2015-10-25 16:33:24.439519078 +0100
+@@ -320,7 +320,7 @@
+ conf->store_path = strdup(basename(selinux_policy_root()));
+ conf->ignoredirs = NULL;
+ conf->store_root_path = strdup("/var/lib/selinux");
+- conf->compiler_directory_path = strdup("/usr/libexec/selinux/hll");
++ conf->compiler_directory_path = strdup(LIBEXECDIR "/selinux/hll");
+ conf->policyvers = sepol_policy_kern_vers_max();
+ conf->target_platform = SEPOL_TARGET_SELINUX;
+ conf->expand_check = 1;
+--- libsemanage-2.4/src/Makefile.orig 2015-02-02 15:38:10.000000000 +0100
++++ libsemanage-2.4/src/Makefile 2015-10-25 16:33:33.496185556 +0100
+@@ -9,6 +9,7 @@
+ # Installation directories.
+ PREFIX ?= $(DESTDIR)/usr
+ LIBDIR ?= $(PREFIX)/lib
++LIBEXECDIR ?= $(PREFIX)/libexec
+ SHLIBDIR ?= $(DESTDIR)/lib
+ INCLUDEDIR ?= $(PREFIX)/include
+ PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" %
sys.version_info[0:2])')
+@@ -60,7 +61,7 @@
+ SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable
-Wno-shadow \
+ -Wno-unused-parameter
+
+-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE
++override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE
-DLIBEXECDIR=\"$(LIBEXECDIR)\"
+ RANLIB=ranlib
+
+ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsemanage.git/commitdiff/be126f80ab59e82a6f79e8ce0add10af4cc2e4b9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
