[setroubleshoot/f20] Don't error out on no policy installed

[Daniel J Walsh]

commit 1d34205ddf65c64432bdd7b5d5516601f7348fa3
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Thu Jan 2 18:23:14 2014 -0500

    Don't error out on no policy installed
    
    - Update translations.

 .gitignore          |    3 +++
 setroubleshoot.spec |   31 +++++++++++++++++--------------
 sources             |    2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 487d4fb..edd9902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,3 +175,6 @@ setroubleshoot-2.2.93.tar.gz
 /setroubleshoot-3.2.11.tar.gz
 /setroubleshoot-3.2.12.tar.gz
 /setroubleshoot-3.2.13.tar.gz
+/setroubleshoot-3.2.14.tar.gz
+/setroubleshoot-3.2.15.tar.gz
+/setroubleshoot-3.2.16.tar.gz
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index aed2ef1..5900322 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,14 +1,13 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 3.2.14
-Release: 2%{?dist}
+Version: 3.2.16
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 # git clone git://git.fedorahosted.org/git/setroubleshoot.git; cd setroubleshoot
 # git archive --prefix setroubleshoot-3.0.10/426cf8ea7a38e8c5179981219d831368161b65f2 > setroubleshoot-3.0.10.tar.gz
 Source0: %{name}-%{version}.tar.gz
-patch: setroubleshoot-po.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: libcap-ng-devel
@@ -28,9 +27,7 @@ Requires: notify-python
 BuildRequires: xdg-utils
 Requires: xdg-utils
 
-%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-
-%global pkgpythondir  %{python_sitelib}/%{name}
+%global pkgpythondir  %{python_sitearch}/%{name}
 %define pkgguidir     %{_datadir}/%{name}/gui
 %define pkgdatadir    %{_datadir}/%{name}
 %define pkglibexecdir %{_prefix}/libexec/%{name}
@@ -76,7 +73,6 @@ fi
 
 %prep
 %setup -q
-%patch -p1 -b .badpo
 
 %build
 %configure
@@ -111,9 +107,6 @@ Requires: dbus
 Requires: dbus-python
 Requires: polkit
 
-Requires(post):   /sbin/service
-Requires(preun):  /sbin/service
-
 %description server
 Provides tools to help diagnose SELinux problems. When AVC messages
 are generated an alert can be generated that will give information
@@ -127,9 +120,8 @@ to user preference. The same tools can be run on existing log files.
 %systemd_postun_with_restart auditd.service
 
 %triggerun server -- %{name}-server < 2.1.1
-/sbin/service %{name} stop >/dev/null 2>&1 || :
-chkconfig --del %{name}  || :
-
+/usr/bin/systemctl --no-reload disable %{name} >/dev/null 2>&1 || :
+/usr/bin/systemctl stop %{name} >/dev/null 2>&1 || :
 %clean 
 rm -rf %{buildroot}
 
@@ -138,7 +130,7 @@ rm -rf %{buildroot}
 %{_bindir}/sealert
 %{_sbindir}/sedispatch
 %{_sbindir}/setroubleshootd
-%{python_sitelib}/setroubleshoot*.egg-info
+%{python_sitearch}/setroubleshoot*.egg-info
 %dir %attr(0755,root,root) %{pkgconfigdir}
 %dir %attr(0755,root,root) %{pkgpythondir}
 %{pkgpythondir}/Plugin.py*
@@ -178,6 +170,17 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/system-services/org.fedoraproject.SetroubleshootFixit.service
 
 %changelog
+* Thu Jan 2 2014 Dan Walsh <dwalsh at redhat.com> - 3.2.16-1
+- Don't error out on no policy installed
+- Update translations.
+
+* Thu Jan 2 2014 Dan Walsh <dwalsh at redhat.com> - 3.2.15-2
+- Eliminate requirement on service script.
+
+* Tue Dec 3 2013 Dan Walsh <dwalsh at redhat.com> - 3.2.15-1
+- Update Lanquages
+- Use setup.py in Makefile for setroubleshoot dir
+
 * Wed Nov 20 2013 Dan Walsh <dwalsh at redhat.com> - 3.2.14-2
 - Add requires for libreport-python
 
diff --git a/sources b/sources
index 2554d30..517f7d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-699aae3a4faec6296a90d6f2bd806e79  setroubleshoot-3.2.14.tar.gz
+e07ca6da6d0c84238ddbcadebf43a1d5  setroubleshoot-3.2.16.tar.gz