commit 405d3cf02d9fefb50ad640449fc7cfb17a47141c
Author: Jan Rękorajski <[email protected]>
Date: Fri Mar 26 10:02:08 2021 +0100
- up to 3.0.1, python2 not supported
apparmor-utils-pysetup.patch | 2 +-
apparmor-utils.spec | 40 +++-------------------------------------
2 files changed, 4 insertions(+), 38 deletions(-)
---
diff --git a/apparmor-utils.spec b/apparmor-utils.spec
index 50eec5a..d476899 100644
--- a/apparmor-utils.spec
+++ b/apparmor-utils.spec
@@ -1,27 +1,18 @@
-#
-# 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.4
+Version: 3.0.1
Release: 1
Epoch: 1
License: GPL v2
Group: Base
-Source0:
http://launchpad.net/apparmor/2.13/%{version}/+download/apparmor-%{version}.tar.gz
-# Source0-md5: a50b793a3362551f07733be3df9c328f
+Source0:
http://launchpad.net/apparmor/3.0/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5: e05eab22bdd1dfc64854856a7292cf09
Patch0: %{name}-pysetup.patch
URL: http://wiki.apparmor.net/
BuildRequires: gettext-tools
-%if %{with python3}
BuildRequires: python3
Requires: python3-LibAppArmor
-%else
-BuildRequires: python
-Requires: python-LibAppArmor
-%endif
Requires: apparmor-binutils >= %{version}
Requires: perl-LibAppArmor
Provides: subdomain-utils
@@ -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)
diff --git a/apparmor-utils-pysetup.patch b/apparmor-utils-pysetup.patch
index 0684471..b8b8847 100644
--- a/apparmor-utils-pysetup.patch
+++ b/apparmor-utils-pysetup.patch
@@ -1,9 +1,9 @@
--- apparmor-2.10.1/utils/Makefile.orig 2015-11-18 21:29:25.000000000
+0100
+++ apparmor-2.10.1/utils/Makefile 2016-04-26 18:56:36.173658050 +0200
@@ -57,7 +57,7 @@
+ $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
$(MAKE) install_manpages DESTDIR=${DESTDIR}
$(MAKE) -C vim install DESTDIR=${DESTDIR}
- ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
- ${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR}
--version=${VERSION}
+ ${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR}
$(PYSETUP_INSTALL_ARGS) --version=${VERSION}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apparmor-utils.git/commitdiff/405d3cf02d9fefb50ad640449fc7cfb17a47141c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
