- updated URLs

[packages/apparmor-utils.git] / apparmor-utils.spec

diff --git a/apparmor-utils.spec b/apparmor-utils.spec
index 847496c77e943b9243a29bbb3b1c831f2c46d8e5..8b283ca9fe60774d3953fc8ac7578ef6e2bd3b5f 100644 (file)
--- a/apparmor-utils.spec
+++ b/apparmor-utils.spec
@@ -1,31 +1,22 @@
-#
-# Conditional build:
-%bcond_with    python3 # use Python 3 instead of Python 2
-
 Summary:       AppArmor userlevel utilities that are useful in creating AppArmor profiles
 Summary(pl.UTF-8):     Narzędzia przestrzeni użytkownika przydatne do tworzenia profili AppArmor
 Name:          apparmor-utils
-Version:       2.13.2
-Release:       2
+Version:       3.1.7
+Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Base
-Source0:       http://launchpad.net/apparmor/2.13/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5: 2439b35266b5a3a461b0a2dba6e863c3
+Source0:       https://launchpad.net/apparmor/3.1/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: eee581ab969f708f1e4c6f2847c0c7a6
 Patch0:                %{name}-pysetup.patch
-URL:           http://wiki.apparmor.net/
+URL:           https://wiki.apparmor.net/
 BuildRequires: gettext-tools
-%if %{with python3}
-BuildRequires: python3
-Requires:      python3-LibAppArmor
-%else
-BuildRequires: python
-Requires:      python-LibAppArmor
-%endif
+BuildRequires: python3 >= 1:3
 Requires:      apparmor-binutils >= %{version}
 Requires:      perl-LibAppArmor
+Requires:      python3-LibAppArmor
 Provides:      subdomain-utils
-Obsoletes:     subdomain-utils
+Obsoletes:     subdomain-utils < 2
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,23 +49,14 @@ Obsługa plików AppArmor dla Vima.
 %setup -q -n apparmor-%{version}
 %patch0 -p1
 
-%if %{with python3}
 %{__sed} -i -e '1s, */usr/bin/env python,%{__python3},' utils/aa-*
-%else
-%{__sed} -i -e '1s, */usr/bin/env python,%{__python},' utils/aa-*
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C utils install \
-%if %{with python3}
        PYTHON="%{__python3}" \
        PYSETUP_INSTALL_ARGS="--install-purelib=%{py3_sitescriptdir} --optimize=2" \
-%else
-       PYTHON="%{__python}" \
-       PYSETUP_INSTALL_ARGS="--install-purelib=%{py_sitescriptdir} --optimize=2" \
-%endif
        DESTDIR=$RPM_BUILD_ROOT \
        BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
        VIM_INSTALL_PATH=$RPM_BUILD_ROOT%{_vimdatadir}/syntax
@@ -84,10 +66,6 @@ cat > $RPM_BUILD_ROOT%{_vimdatadir}/ftdetect/apparmor.vim <<-EOF
 au BufNewFile,BufRead /etc/apparmor.d/*,/etc/apparmor/profiles/* set filetype=apparmor
 EOF
 
-%if %{without python3}
-%py_postclean
-%endif
-
 %find_lang %{name}
 
 %clean
@@ -113,21 +91,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/aa-mergeprof
 %attr(755,root,root) %{_sbindir}/aa-notify
 %attr(755,root,root) %{_sbindir}/aa-remove-unknown
-%attr(755,root,root) %{_sbindir}/aa-status
 %attr(755,root,root) %{_sbindir}/aa-unconfined
-%attr(755,root,root) %{_sbindir}/apparmor_status
 %dir %{_datadir}/apparmor
 %{_datadir}/apparmor/easyprof
-%if %{with python3}
 %{py3_sitescriptdir}/apparmor
 %{py3_sitescriptdir}/apparmor-%{version}-py*.egg-info
-%else
-%dir %{py_sitescriptdir}/apparmor
-%{py_sitescriptdir}/apparmor/*.py[co]
-%dir %{py_sitescriptdir}/apparmor/rule
-%{py_sitescriptdir}/apparmor/rule/*.py[co]
-%{py_sitescriptdir}/apparmor-%{version}-py*.egg-info
-%endif
 %{_mandir}/man5/logprof.conf.5*
 %{_mandir}/man8/aa-audit.8*
 %{_mandir}/man8/aa-autodep.8*
@@ -142,9 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/aa-mergeprof.8*
 %{_mandir}/man8/aa-notify.8*
 %{_mandir}/man8/aa-remove-unknown.8*
-%{_mandir}/man8/aa-status.8*
 %{_mandir}/man8/aa-unconfined.8*
-%{_mandir}/man8/apparmor_status.8*
 
 %files -n vim-syntax-apparmor
 %defattr(644,root,root,755)