rpms
/
policycoreutils
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Translations

This commit is contained in:
Dan Walsh 2014-04-01 09:53:21 -04:00
parent e9004a6bf6 d5a13602dd
commit 110c90c00a
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
policycoreutils-sepolicy-manpage.patch
View File

@ -1,30 +1,25 @@
From 29e87275aa5e885ca87316a50beb0fcb957a4218 Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Wed, 26 Mar 2014 14:38:16 +0100
Subject: [PATCH] Add support for Fedora21 html manpage structure
---
policycoreutils/sepolicy/sepolicy/manpage.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/policycoreutils/sepolicy/sepolicy/manpage.py b/policycoreutils/sepolicy/sepolicy/manpage.py
index 09066d9..1765b1c 100755
index afa9922..9af0794 100755
--- a/policycoreutils/sepolicy/sepolicy/manpage.py
+++ b/policycoreutils/sepolicy/sepolicy/manpage.py
@@ -135,7 +135,7 @@ def prettyprint(f,trim):
manpage_domains = []
manpage_roles = []
-fedora_releases = ["Fedora17","Fedora18"]
+fedora_releases = ["Fedora17","Fedora18","Fedora19","Fedora20"]
-fedora_releases = ["Fedora17","Fedora18","Fedora19","Fedora20"]
+fedora_releases = ["Fedora17","Fedora18","Fedora19","Fedora20","Fedora21"]
rhel_releases = ["RHEL6","RHEL7"]
def get_alphabet_manpages(manpage_list):
@@ -152,14 +152,14 @@ def get_alphabet_manpages(manpage_list):
def convert_manpage_to_html(html_manpage,manpage):
try:
- subprocess.check_output("/usr/bin/groff -man -Thtml %s 2>/dev/null" % manpage,
+ man_page = subprocess.check_output("/usr/bin/groff -man -Thtml %s 2>/dev/null" % manpage,
stderr=subprocess.STDOUT,
shell=True)
except subprocess.CalledProcessError as e:
sys.stderr.write(e.output)
return
fd = open(html_manpage,'w')
- fd.write(output)
+ fd.write(man_page)
fd.close()
print(html_manpage)
--
1.8.5.3

10
policycoreutils.spec
View File

@ -18,6 +18,7 @@ Source2: policycoreutils_man_ru2.tar.bz2
Source3: system-config-selinux.png
Source4: sepolicy-icons.tgz
Patch: policycoreutils-rhat.patch
Patch1: policycoreutils-sepolicy-manpage.patch
#Patch1: policycoreutils-sepolgen.patch
Obsoletes: policycoreutils < 2.0.61-2
Conflicts: filesystem < 3
@ -49,6 +50,7 @@ to switch roles.
%prep
%setup -q -a 1
%patch -p2 -b .rhat
%patch1 -p2 -b .manpage
#%patch1 -p2 -b .sepolgen -d sepolgen-%{sepolgenver}
cp %{SOURCE3} gui/
tar xvf %{SOURCE4}
@ -272,7 +274,7 @@ Summary: SELinux configuration GUI
Group: System Environment/Base
Requires: policycoreutils-devel = %{version}-%{release}
Requires: gnome-python2 gnome-python2-gnome, pygtk2, pygtk2-libglade, gnome-python2-canvas
Requires: usermode-gtk2
Requires: usermode-gtk
Requires: python >= 2.6
BuildRequires: desktop-file-utils
@ -386,9 +388,9 @@ The policycoreutils-restorecond package contains the restorecond service.
* Tue Apr 1 2014 Dan Walsh <dwalsh@redhat.com> - 2.2.5-11
- Update Translations
* Sun Mar 30 2014 Dan Walsh <dwalsh@redhat.com> - 2.2.5-10
- [PATCH] Add support for Fedora21 html manpage structure
- From Miroslav Grepl
* Thu Mar 27 2014 Miroslav Grepl <mgrepl@redhat.com> - 2.2.5-10
- Add support for Fedora21 html manpage structure
- Fix broken dependencies to require only usermode-gtk
* Wed Mar 26 2014 Dan Walsh <dwalsh@redhat.com> - 2.2.5-9
- mgrepl [PATCH] Deleteall user customization fails if there is a user used