X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apparmor-utils.spec;h=8e03e84251455ee590924872131d713ba5045777;hb=a0fac68ec389e64314013a291bd42b44340ca94b;hp=2ac84331c9e3ad7872f53fd25e3c251bf08cc6c4;hpb=08a56991ef93c8d55a7019d13b4997e48f454b97;p=packages%2Fapparmor-utils.git

diff --git a/apparmor-utils.spec b/apparmor-utils.spec
index 2ac8433..8e03e84 100644
--- a/apparmor-utils.spec
+++ b/apparmor-utils.spec
@@ -1,27 +1,33 @@
-%include	/usr/lib/rpm/macros.perl
-%define		_vimdatadir	%{_datadir}/vim/vimfiles
-%define		_ver 2.0.1
-%define		_svnrel 449
+
+%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:	%{_ver}.%{_svnrel}
-Release:	0.2
+Version:	2.10.1
+Release:	1
 Epoch:		1
+License:	GPL v2
 Group:		Base
-Source0:	http://forgeftp.novell.com/apparmor/Development%20-%20March%2007%20-%20SnapShot/%{name}-%{_ver}-%{_svnrel}.tar.gz
-# Source0-md5:	4fa850985622391371dd84939ffafa2d
-Source1:	Ycp.pm
-License:	GPL
-URL:		http://forge.novell.com/modules/xfmod/project/?apparmor
-BuildRequires:	gettext-devel
-BuildRequires:	rpm-perlprov
-Requires:	DBD-SQLite >= 1.08
+Source0:	http://launchpad.net/apparmor/2.10/%{version}/+download/apparmor-%{version}.tar.gz
+# Source0-md5:	c9d82e04d699b0530b12dec15136027d
+URL:		http://wiki.apparmor.net/
+BuildRequires:	gettext-tools
+%if %{with python3}
+BuildRequires:	python3
+Requires:	python3-LibAppArmor
+%else
+BuildRequires:	python
+Requires:	python-LibAppArmor
+%endif
+Requires:	perl-LibAppArmor
 Provides:	subdomain-utils
 Obsoletes:	subdomain-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_vimdatadir	%{_datadir}/vim/vimfiles
+
 %description
 This provides some useful programs to help create and manage AppArmor
 profiles. This package is part of a suite of tools that used to be
@@ -36,7 +42,8 @@ zestawu narzędzi zwanych SubDomain.
 Summary:	AppArmor files support for Vim
 Summary(pl.UTF-8):	Obsługa plików AppArmor dla Vima
 Group:		Applications/Editors/Vim
-Requires:	vim >= 4:6.3.058-3
+# for _vimdatadir existence
+Requires:	vim-rt >= 4:6.3.058-3
 
 %description -n vim-syntax-apparmor
 AppArmor files support for Vim.
@@ -45,38 +52,76 @@ AppArmor files support for Vim.
 Obsługa plików AppArmor dla Vima.
 
 %prep
-%setup -q -n %{name}-%{_ver}
+%setup -q -n apparmor-%{version}
+
+%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}" \
+%else
+	PYTHON="%{__python}" \
+%endif
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
-	PERLDIR=$RPM_BUILD_ROOT%{perl_vendorlib}/Immunix
-
-%find_lang %{name}
-
-install -d $RPM_BUILD_ROOT%{_vimdatadir}/{syntax,ftdetect}
-install apparmor.vim $RPM_BUILD_ROOT%{_vimdatadir}/syntax
-install %{SOURCE1} $RPM_BUILD_ROOT%{perl_vendorlib}/Immunix
+	VIM_INSTALL_PATH=$RPM_BUILD_ROOT%{_vimdatadir}/syntax
 
+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
 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}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/apparmor
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/*
-%attr(755,root,root) %{_sbindir}/*
-%dir %{perl_vendorlib}/Immunix
-%{perl_vendorlib}/Immunix/*
-%dir /var/log/apparmor
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/easyprof.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/logprof.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/notify.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apparmor/severity.db
+%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
+%if %{with python3}
+%{py3_sitedir}/apparmor
+%{py3_sitedir}/apparmor-%{version}-py*.egg-info
+%else
+%dir %{py_sitedir}/apparmor
+%{py_sitedir}/apparmor/*.py[co]
+%dir %{py_sitedir}/apparmor/rule
+%{py_sitedir}/apparmor/rule/*.py[co]
+%{py_sitedir}/apparmor-%{version}-py*.egg-info
+%endif
+%{_mandir}/man5/logprof.conf.5*
+%{_mandir}/man8/aa-*.8*
+%{_mandir}/man8/apparmor_status.8*
 
 %files -n vim-syntax-apparmor
 %defattr(644,root,root,755)
-%{_vimdatadir}/ftdetect/*
-%{_vimdatadir}/syntax/*
+%{_vimdatadir}/ftdetect/apparmor.vim
+%{_vimdatadir}/syntax/apparmor.vim
+%{_mandir}/man5/apparmor.vim.5*