Accepting request 123313 from home:cboltz

- update to AppArmor 2.8.0 (= r2047)
  - new utility aa-easyprof - templated profile generation tool (the resulting
    profile may be less strict than profiles generated with genprof/logprof)
  - various small bugfixes
- removed upstreamed patches

OBS-URL: https://build.opensuse.org/request/show/123313
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=12

apparmor.spec

@@ -43,7 +43,7 @@ Name:           apparmor
 %if ! %{?distro:1}0
   %define distro suse
 %endif
-Version:        2.7.103
+Version:        2.8.0
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0+
@@ -71,12 +71,6 @@ Patch12:        apparmor-2.5.1-edirectory-profile
 # create Immunix::SubDomain perl module - only included for openSUSE <= 12.1 - bnc#720617 #c7
 Patch21:        apparmor-utils-subdomain-compat
 
-# bnc#738905 - commited upstream (after 2.7.2 / 2.8 beta5)
-Patch22:        apparmor-dnsmasq-profile-fix.patch
-
-# use hyperref and use techdoc.tex's file date for the pdf's creation and mod date (avoids useless rebuilds) - patch sent upstream after 2.8 beta5
-Patch30:        apparmor-techdoc.patch
-
 Url:            https://launchpad.net/apparmor
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -413,13 +407,6 @@ SubDomain.
 %patch21 -p1
 %endif
 %endif
-%patch22 -p1
-
-# preserve timestamp of techdoc.tex
-touch -r parser/techdoc.tex parser/techdoc.timestamp 
-%patch30 -p0
-# preserve timestamp of techdoc.tex
-touch -r parser/techdoc.timestamp parser/techdoc.tex
 
 # profile for winbindd (bnc#748499, not upstreamed yet)
 test ! -e profiles/apparmor.d/usr.sbin.winbindd
@@ -568,8 +555,8 @@ echo -------------------------------------------------------------------
 %doc common/apparmor.css
 %doc parser/techdoc.pdf parser/techdoc/techdoc.html parser/techdoc/techdoc.css parser/techdoc.txt
 # apparmor.vim is included in the vim package. Ideally it should be in a -devel package, but that's overmuch for one file
-%dir /usr/share/apparmor
-/usr/share/apparmor/apparmor.vim
+%dir %{_datadir}/apparmor
+%{_datadir}/apparmor/apparmor.vim
 
 %files parser
 %defattr(-,root,root)
@@ -640,10 +627,16 @@ fi
 %files utils
 %defattr(-,root,root)
 %dir %{_sysconfdir}/apparmor
+%config(noreplace) %{_sysconfdir}/apparmor/easyprof.conf
 %config(noreplace) %{_sysconfdir}/apparmor/logprof.conf
 %config(noreplace) %{_sysconfdir}/apparmor/notify.conf
 %config(noreplace) %{_sysconfdir}/apparmor/severity.db
 %{_sbindir}/*
+%{_bindir}/aa-easyprof
+%{python_sitelib}/apparmor-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/apparmor/
+%dir %{_datadir}/apparmor
+%{_datadir}/apparmor/easyprof/
 %dir %{_localstatedir}/log/apparmor
 %doc %{_mandir}/man2/aa_change_profile.2.gz
 %doc %{_mandir}/man5/logprof.conf.5.gz
@@ -654,6 +647,7 @@ fi
 %doc %{_mandir}/man8/autodep.8.gz
 %doc %{_mandir}/man8/complain.8.gz
 %doc %{_mandir}/man8/disable.8.gz
+%doc %{_mandir}/man8/easyprof.8.gz
 %doc %{_mandir}/man8/enforce.8.gz
 %doc %{_mandir}/man8/exec.8.gz
 %doc %{_mandir}/man8/genprof.8.gz