diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch index 74da8e0..f517682 100644 --- a/libsemanage-rhat.patch +++ b/libsemanage-rhat.patch @@ -52,9 +52,24 @@ index 4d25b07..32cc33c 100644 int fd; FILE *fptr; diff --git libsemanage-2.4/utils/semanage_migrate_store libsemanage-2.4/utils/semanage_migrate_store -index 03b492e..6584002 100755 +index 03b492e..ba8a1f3 100755 --- libsemanage-2.4/utils/semanage_migrate_store +++ libsemanage-2.4/utils/semanage_migrate_store +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -E ++#!/usr/bin/python3 -E + + + from __future__ import print_function +@@ -17,7 +17,7 @@ try: + import selinux + import semanage + except: +- print("You must install libselinux-python and libsemanage-python before running this tool", file=sys.stderr) ++ print("You must install libselinux-python3 and libsemanage-python3 before running this tool", file=sys.stderr) + exit(1) + + @@ -221,7 +221,7 @@ def rebuild_policy(): diff --git a/libsemanage.spec b/libsemanage.spec index 5ca6ddd..f79a6bf 100644 --- a/libsemanage.spec +++ b/libsemanage.spec @@ -7,12 +7,12 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/libsemanage-%{version}.tar.gz # use make-rhat-patches.sh to create following patch from https://github.com/bachradsusi/selinux.git -# HEAD https://github.com/fedora-selinux/selinux/commit/36fd8bb4b36bb1ca3aa10e3226136459e6ed2498 +# HEAD https://github.com/fedora-selinux/selinux/commit/336103fb6eb115f437f006b065a4f90b63056102 Patch: libsemanage-rhat.patch URL: https://github.com/SELinuxProject/selinux/wiki Source1: semanage.conf @@ -76,6 +76,7 @@ SELinux management applications. Summary: semanage python 3 bindings for libsemanage Group: Development/Libraries Requires: libsemanage = %{version}-%{release} +Requires: libselinux-python3 %description python3 The libsemanage-python3 package contains the python 3 bindings for developing @@ -156,7 +157,6 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_libexecdir}/selinux %dir %{_sharedstatedir}/selinux %dir %{_sharedstatedir}/selinux/tmp -%{_libexecdir}/selinux/semanage_migrate_store %post -p /sbin/ldconfig @@ -185,9 +185,14 @@ rm -rf ${RPM_BUILD_ROOT} %{python3_sitearch}/*.so %{python3_sitearch}/semanage.py* %{python3_sitearch}/__pycache__/semanage* +%{_libexecdir}/selinux/semanage_migrate_store %endif # if with_python3 %changelog +* Thu Jul 30 2015 Petr Lautrbach 2.4-2 +- semanage_migrate_store: use /usr/bin/python3 +- move semanage_migrate_store script to libsemanage-python3 + * Wed Jun 24 2015 Petr Lautrbach 2.4-0.6 - Allow to use compressed modules without a compression extension