From c2744d57c41aace00a43d0dd75c71e68a65b46fd5fa4796a87750dd2fe7f0019 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 18 Jun 2019 22:47:39 +0000 Subject: [PATCH] Accepting request 710682 from home:cboltz - re-number remaining patches OBS-URL: https://build.opensuse.org/request/show/710682 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=247 --- apparmor.changes | 1 + apparmor.spec | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apparmor.changes b/apparmor.changes index dc15b89..dc1c35f 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -17,6 +17,7 @@ Tue Jun 18 20:51:07 UTC 2019 - Christian Boltz - dnsmasq-revert-alternation.diff - usrmerge-fixes.diff - libapparmor-swig-4.diff +- re-number remaining patches ------------------------------------------------------------------- Wed Jun 5 11:36:25 UTC 2019 - Christian Boltz diff --git a/apparmor.spec b/apparmor.spec index 765ee95..02f2daa 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -57,13 +57,13 @@ Patch1: apparmor-enable-profile-cache.diff Patch2: apparmor-samba-include-permissions-for-shares.diff # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkaempf@suse.de -Patch5: ruby-2_0-mkmf-destdir.patch +Patch3: ruby-2_0-mkmf-destdir.patch # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21) -Patch7: apparmor-lessopen-profile.patch +Patch4: apparmor-lessopen-profile.patch # workaround for boo#1119937 / lp#1784499 - allow network access for reading files on NFS (proper solution needs kernel fix) -Patch10: apparmor-lessopen-nfs-workaround.diff +Patch5: apparmor-lessopen-nfs-workaround.diff PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -350,9 +350,9 @@ SubDomain. %setup -q %patch1 %patch2 -%patch5 -p1 -%patch7 -%patch10 +%patch3 -p1 +%patch4 +%patch5 %build %define _lto_cflags %{nil}