From 8373c69e96b9437669fea0706d3fdc9c25f3ee6b Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 27 Jun 2016 12:55:29 +0200 Subject: [PATCH] policycoreutils-2.5-11 - Convert sandbox to gtk-3 using pygi-convert.sh (#1343166) --- policycoreutils-fedora.patch | 13 ++++++++++++- policycoreutils.spec | 7 +++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/policycoreutils-fedora.patch b/policycoreutils-fedora.patch index c621943..8308bf5 100644 --- a/policycoreutils-fedora.patch +++ b/policycoreutils-fedora.patch @@ -654344,7 +654344,7 @@ index b306041..16eb50b 100644 msgid "Loss of data Dialog" msgstr "" diff --git policycoreutils-2.5/sandbox/sandbox policycoreutils-2.5/sandbox/sandbox -index 9e0024f..f15f56e 100644 +index 9e0024f..e7c5be6 100644 --- policycoreutils-2.5/sandbox/sandbox +++ policycoreutils-2.5/sandbox/sandbox @@ -1,4 +1,4 @@ @@ -654407,6 +654407,17 @@ index 9e0024f..f15f56e 100644 def reserve(level): sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) +@@ -452,8 +451,8 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- + if self.__options.dpi: + dpi = self.__options.dpi + else: +- import gtk +- dpi = str(gtk.settings_get_default().props.gtk_xft_dpi / 1024) ++ from gi.repository import Gtk ++ dpi = str(Gtk.Settings.get_default().props.gtk_xft_dpi / 1024) + + xmodmapfile = self.__homedir + "/.xmodmap" + xd = open(xmodmapfile, "w") diff --git policycoreutils-2.5/sandbox/sandbox.8 policycoreutils-2.5/sandbox/sandbox.8 index 0c8cd1e..81f497a 100644 --- policycoreutils-2.5/sandbox/sandbox.8 diff --git a/policycoreutils.spec b/policycoreutils.spec index 6790129..9d6f8a9 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: System Environment/Base # https://github.com/SELinuxProject/selinux/wiki/Releases @@ -20,7 +20,7 @@ Source4: sepolicy-icons.tgz # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh # run: # $ VERSION=2.5 ./make-fedora-selinux-patch.sh policycoreutils -# HEAD https://github.com/fedora-selinux/selinux/commit/9abe77e2a670f2f2dfb91f9cec46ee37f9c23995 +# HEAD https://github.com/fedora-selinux/selinux/commit/634c4b3550043ae33ba69d0e292de41c32dbf4f5 Patch: policycoreutils-fedora.patch # $ VERSION=1.2.3 ./make-fedora-selinux-patch.sh sepolgen Patch1: sepolgen-fedora.patch @@ -408,6 +408,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Mon Jun 27 2016 Petr Lautrbach - 2.5-11 +- Convert sandbox to gtk-3 using pygi-convert.sh (#1343166) + * Thu Jun 23 2016 Petr Lautrbach - 2.5-10 - Fix typos in semanage manpages - Fix the documentation of -l,--list for semodule