From f37e9eb044f35105740d7bf17ced3eb8c8a4a037 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 18 Aug 2015 18:14:09 +0200 Subject: [PATCH] setroubleshoot-3.3.1-0.1 - port setroubleshoot to Python 3 - based on python3 branch fedora-selinux/setroubleshoot - HEAD e52a05819c4dfe5bdc6998c75780c890ca9ed288 --- .gitignore | 1 + setroubleshoot.spec | 45 ++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 1ca6f9f..f8c392e 100644 --- a/.gitignore +++ b/.gitignore @@ -185,3 +185,4 @@ setroubleshoot-2.2.93.tar.gz /setroubleshoot-3.2.22.tar.gz /setroubleshoot-3.2.23.tar.gz /setroubleshoot-3.2.24.tar.gz +/setroubleshoot-3.3.1.tar.gz diff --git a/setroubleshoot.spec b/setroubleshoot.spec index 2600641..b45961a 100644 --- a/setroubleshoot.spec +++ b/setroubleshoot.spec @@ -1,25 +1,28 @@ Summary: Helps troubleshoot SELinux problems Name: setroubleshoot -Version: 3.2.24 -Release: 3%{?dist} +Version: 3.3.1 +Release: 0.1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/setroubleshoot # git clone https://github.com/fedora-selinux/setroubleshoot.git # cd setroubleshoot/framework/ -# git checkout setroubleshoot-%{version} +# # for the devel version use +# git checkout python3 +# # for a relase use +# # git checkout setroubleshoot-%{version} # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.gz Source1: %{name}.tmpfiles BuildRequires: perl-XML-Parser BuildRequires: libcap-ng-devel -BuildRequires: intltool gettext python +BuildRequires: intltool gettext python3 python3-devel BuildRequires: desktop-file-utils dbus-glib-devel gtk2-devel libnotify-devel audit-libs-devel libselinux-devel polkit-devel Requires: %{name}-server = %{version}-%{release} Requires: pygtk2-libglade >= 2.9.2 Requires: gtk2 -Requires: libreport-gtk >= 2.2.1-2, libreport-python +Requires: libreport-gtk >= 2.2.1-2, libreport-python3 Requires(post): desktop-file-utils Requires(post): dbus Requires(postun): desktop-file-utils @@ -28,7 +31,7 @@ Requires(postun): dbus BuildRequires: xdg-utils Requires: xdg-utils -%global pkgpythondir %{python_sitearch}/%{name} +%global pkgpythondir %{python3_sitelib}/%{name} %define pkgguidir %{_datadir}/%{name}/gui %define pkgdatadir %{_datadir}/%{name} %define pkglibexecdir %{_prefix}/libexec/%{name} @@ -38,7 +41,7 @@ Requires: xdg-utils %define username setroubleshoot %description -setroubleshoot GUI. Application that allows you to view setroubleshoot-server +setroubleshoot GUI. Application that allows you to view setroubleshoot-server messages. Provides tools to help diagnose SELinux problems. When AVC messages are generated an alert can be generated that will give information @@ -58,6 +61,8 @@ to user preference. The same tools can be run on existing log files. %{_bindir}/seapplet %attr(0644,root,root) %{_tmpfilesdir}/%{name}.conf %attr(0711,setroubleshoot,setroubleshoot) %dir %{_rundir}/setroubleshoot +%{pkgpythondir}/__pycache__/* + %post touch --no-create %{_datadir}/icons/hicolor || : @@ -79,10 +84,10 @@ fi %setup -q %build -%configure +%configure PYTHON=%{__python3} make -%install +%install rm -rf %{buildroot} make DESTDIR=%{buildroot} install desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}/%{_datadir}/applications/%{name}.desktop @@ -103,15 +108,15 @@ Group: Applications/System Requires: %{name}-plugins >= 3.0.14 Requires: audit >= 1.2.6-3 -Requires: audit-libs-python >= 1.2.6-3 -Requires: libxml2-python -Requires: rpm-python -Requires: libselinux-python >= 2.1.5-1 +Requires: audit-libs-python3 >= 1.2.6-3 +Requires: libxml2-python3 +Requires: rpm-python3 +Requires: libselinux-python3 >= 2.1.5-1 Requires: policycoreutils-python-utils -BuildRequires: intltool gettext python -BuildRequires: python-devel +BuildRequires: intltool gettext python3 +BuildRequires: python3-devel Requires: python-slip-dbus systemd-python >= 206-1 -Requires: pygobject2 +Requires: pygobject3 >= 3.11 Requires: dbus Requires: dbus-python Requires: polkit @@ -138,13 +143,13 @@ chown -R setroubleshoot:setroubleshoot %{pkgvardatadir} %clean rm -rf %{buildroot} -%files server -f %{name}.lang +%files server -f %{name}.lang %defattr(-,root,root,-) %{_datadir}/appdata/*.appdata.xml %{_bindir}/sealert %{_sbindir}/sedispatch %{_sbindir}/setroubleshootd -%{python_sitearch}/setroubleshoot*.egg-info +%{python3_sitelib}/setroubleshoot*.egg-info %dir %attr(0755,root,root) %{pkgconfigdir} %dir %attr(0755,root,root) %{pkgpythondir} %{pkgpythondir}/Plugin.py* @@ -165,7 +170,6 @@ rm -rf %{buildroot} %{pkgpythondir}/util.py* %{pkgpythondir}/uuid.py* %{pkgpythondir}/xml_serialize.py* -%attr(0755,root,root) %{pkgpythondir}/default_encoding_utf8.so %dir %{pkgdatadir} %{pkgdatadir}/SetroubleshootFixit.py* %{pkgdatadir}/updater.py* @@ -184,6 +188,9 @@ rm -rf %{buildroot} %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service %changelog +* Tue Aug 18 2015 Petr Lautrbach 3.3.1-0.1 +- port setroubleshoot to Python 3 + * Mon Jul 27 2015 Petr Lautrbach 3.2.24-3 - setroubleshoot-server depends on policycoreutils-python-utils (#1246625) diff --git a/sources b/sources index ce6c46b..c380ee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bff0231ea61ffa69689bf93d71cbd8f9 setroubleshoot-3.2.24.tar.gz +597f296f7b3e1ad0fe5701f1dfaf8b45 setroubleshoot-3.3.1.tar.gz