diff --git a/SOURCES/0001-Make-selinux-policy-build-working-also-on-another-arch.patch b/SOURCES/0001-Make-selinux-policy-build-working-also-on-another-arch.patch new file mode 100644 index 0000000..8515551 --- /dev/null +++ b/SOURCES/0001-Make-selinux-policy-build-working-also-on-another-arch.patch @@ -0,0 +1,73 @@ +From ebe08cf927d75a7546d649fcaa73e1af5996150b Mon Sep 17 00:00:00 2001 +From: Miroslav Grepl +Date: Fri, 13 Jun 2014 08:21:26 +0200 +Subject: [PATCH] Make selinux-policy build working also on another + architectures related to sepolicy-manpage generate + +--- + policycoreutils/sepolicy/sepolicy/__init__.py | 21 ++++++++++++--------- + policycoreutils/sepolicy/sepolicy/manpage.py | 6 +++--- + 2 files changed, 15 insertions(+), 12 deletions(-) + +diff --git a/policycoreutils/sepolicy/sepolicy/__init__.py b/policycoreutils/sepolicy/sepolicy/__init__.py +index 7ef8adf..e3943c0 100644 +--- a/policycoreutils/sepolicy/sepolicy/__init__.py ++++ b/policycoreutils/sepolicy/sepolicy/__init__.py +@@ -888,16 +888,19 @@ def get_os_version(): + output = subprocess.check_output("rpm -q '%s'" % pkg_name, + stderr=subprocess.STDOUT, + shell=True) +- os_version = str(output).split(".")[-2] +- except subprocess.CalledProcessError as e: +- print(e.output) ++ try: ++ os_version = str(output).split(".")[-2] ++ if os_version[0:2] == "fc": ++ os_version = "Fedora"+os_version[2:] ++ elif os_version[0:2] == "el": ++ os_version = "RHEL"+os_version[2:] ++ else: ++ os_version = "Misc" ++ except IndexError: ++ os_version = "Misc" + +- if os_version[0:2] == "fc": +- os_version = "Fedora"+os_version[2:] +- elif os_version[0:2] == "el": +- os_version = "RHEL"+os_version[2:] +- else: +- os_version = "" ++ except subprocess.CalledProcessError: ++ os_version = "Misc" + + return os_version + +diff --git a/policycoreutils/sepolicy/sepolicy/manpage.py b/policycoreutils/sepolicy/sepolicy/manpage.py +index 1765b1c..ecb4461 100755 +--- a/policycoreutils/sepolicy/sepolicy/manpage.py ++++ b/policycoreutils/sepolicy/sepolicy/manpage.py +@@ -175,7 +175,7 @@ class HTMLManPages: + self.old_path = path + "/" + self.new_path = self.old_path + self.os_version+"/" + +- if self.os_version in fedora_releases or rhel_releases: ++ if (self.os_version in fedora_releases) or (self.os_version in rhel_releases) or (self.os_version == "Misc"): + self.__gen_html_manpages() + else: + print(("SELinux HTML man pages can not be generated for this %s" % os_version)) +@@ -255,10 +255,10 @@ Fedora or Red Hat Enterprise Linux Man Pages. + + + +- Linux man-pages online for Fedora18 ++ Linux man-pages online for Fedora/RHEL + + +-

SELinux man pages for Fedora18

SELinux man pages for Fedora/RHEL

+ +

+-- +2.0.4 + diff --git a/SPECS/policycoreutils.spec b/SPECS/policycoreutils.spec index 911c714..8c5c5e1 100644 --- a/SPECS/policycoreutils.spec +++ b/SPECS/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.2.5 -Release: 11%{?dist} +Release: 11%{?dist}.1 License: GPLv2 Group: System Environment/Base # Based on git repository with tag 20101221 @@ -22,6 +22,7 @@ Patch1: policycoreutils-po.patch Patch2: policycoreutils-matchbox.patch Patch3: policycoreutils-semanage-range.patch Patch4: policycoreutils-run_init.patch +Patch5: 0001-Make-selinux-policy-build-working-also-on-another-arch.patch Obsoletes: policycoreutils < 2.0.61-2 Conflicts: filesystem < 3 Provides: /sbin/fixfiles @@ -57,6 +58,7 @@ to switch roles. %patch2 -p1 -b .matchbox %patch3 -p1 -b .semanage-range %patch4 -p2 -b .run_init +%patch5 -p2 -b .build-working cp %{SOURCE3} gui/ tar xvf %{SOURCE4} @@ -352,6 +354,10 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Fri Aug 29 2014 Miroslav Grepl - 2.2.5-11.el7_0.1 +- Make selinux-policy build working also on another architectures related to sepolicy-manpage generate +Resolves:#1135434 + * Fri Apr 4 2014 Dan Walsh - 2.2.5-11 - One more time - Update Translations