- up to 2.11.1

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

diff --git a/apparmor-utils.spec b/apparmor-utils.spec
index e84cf8762d8a8c100f7afdd24c30e45c37671514..50c99fe33e4aa036317cc459f3a035454759a7b8 100644 (file)
--- a/apparmor-utils.spec
+++ b/apparmor-utils.spec
@@ -1,27 +1,35 @@
-%include       /usr/lib/rpm/macros.perl
-%define                _vimdatadir     %{_datadir}/vim/vimfiles
+#
+# 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.8.0
+Version:       2.11.1
 Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Base
-Source0:       http://launchpad.net/apparmor/2.8/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5: eaf90c52992df3d205a753b2933595fe
-Source1:       Ycp.pm
-URL:           http://apparmor.wiki.kernel.org/
-BuildRequires: gettext-devel
+Source0:       http://launchpad.net/apparmor/2.11/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: 936829bebbec41d5c2a29a55b85db272
+Patch0:                %{name}-pysetup.patch
+URL:           http://wiki.apparmor.net/
+BuildRequires: gettext-tools
+%if %{with python3}
+BuildRequires: python3
+Requires:      python3-LibAppArmor
+%else
 BuildRequires: python
-BuildRequires: rpm-perlprov
-Requires:      perl-DBD-SQLite >= 1.08
+Requires:      python-LibAppArmor
+%endif
+Requires:      apparmor-binutils >= %{version}
+Requires:      perl-LibAppArmor
 Provides:      subdomain-utils
 Obsoletes:     subdomain-utils
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreq      'perl(ycp)'
+%define                _vimdatadir     %{_datadir}/vim/vimfiles
 
 %description
 This provides some useful programs to help create and manage AppArmor
@@ -48,24 +56,30 @@ Obsługa plików AppArmor dla Vima.
 
 %prep
 %setup -q -n apparmor-%{version}
+%patch0 -p1
 
-%{__sed} -i -e '1s, */usr/bin/env python,/usr/bin/python,' utils/aa-easyprof
+%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
 cd utils
 
 %{__make} install \
+%if %{with python3}
+       PYTHON="%{__python3}" \
+       PYSETUP_INSTALL_ARGS="--install-purelib=%{py3_sitescriptdir}" \
+%else
+       PYTHON="%{__python}" \
+       PYSETUP_INSTALL_ARGS="--install-purelib=%{py_sitescriptdir}" \
+%endif
        DESTDIR=$RPM_BUILD_ROOT \
        BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
-       PERLDIR=$RPM_BUILD_ROOT%{perl_vendorlib}/Immunix \
        VIM_INSTALL_PATH=$RPM_BUILD_ROOT%{_vimdatadir}/syntax
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{perl_vendorlib}/Immunix
-
-# outdated version of pt
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/pt_PT
-
 install -d $RPM_BUILD_ROOT%{_vimdatadir}/ftdetect
 cat > $RPM_BUILD_ROOT%{_vimdatadir}/ftdetect/apparmor.vim <<-EOF
 au BufNewFile,BufRead /etc/apparmor.d/*,/etc/apparmor/profiles/* set filetype=apparmor
@@ -74,8 +88,12 @@ EOF
 cd ..
 
 # only .pyc are created on install
+%if %{with python3}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitescriptdir}/apparmor
+%else
 %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}/apparmor
 %py_postclean
+%endif
 
 %find_lang %{name}
 
@@ -92,12 +110,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/aa-easyprof
 %attr(755,root,root) %{_sbindir}/aa-*
 %attr(755,root,root) %{_sbindir}/apparmor_status
+%dir %{_datadir}/apparmor
 %{_datadir}/apparmor/easyprof
-%dir %{perl_vendorlib}/Immunix
-%{perl_vendorlib}/Immunix/*.pm
+%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-*.8*
 %{_mandir}/man8/apparmor_status.8*
@@ -106,3 +130,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_vimdatadir}/ftdetect/apparmor.vim
 %{_vimdatadir}/syntax/apparmor.vim
+%{_mandir}/man5/apparmor.vim.5*