diff --git a/apparmor-lessopen-profile.patch b/apparmor-lessopen-profile.patch
index 8d7d551..017e066 100644
--- a/apparmor-lessopen-profile.patch
+++ b/apparmor-lessopen-profile.patch
@@ -17,7 +17,7 @@ Index: profiles/apparmor.d/usr.bin.lessopen.sh
 +
 +  /** rk,
 +  /bin/bash mrix,
-+  /bin/rpm mrix,
++  /{usr/,}bin/rpm mrix,
 +  /bin/tar mrix,
 +  /tmp/less.* rw,
 +  /usr/bin/bzip2 mrix,
diff --git a/apparmor.changes b/apparmor.changes
index a760f5d..c9cdce5 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  2 12:29:06 UTC 2018 - rgoldwyn@suse.com
+
+- Change of path of rpm in lessopen.sh (boo#1082956)
+
 -------------------------------------------------------------------
 Thu Jan 11 18:14:47 CET 2018 - kukuk@suse.de
 
diff --git a/apparmor.spec b/apparmor.spec
index 232ba95..805951e 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -38,7 +38,7 @@ Name:           apparmor
 Version:        2.12
 Release:        0
 Summary:        AppArmor userlevel parser utility
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
 Url:            https://launchpad.net/apparmor
 Source0:        apparmor-%{version}.tar.gz
@@ -115,7 +115,7 @@ BuildRequires:  tomcat6
 
 %package parser
 Summary:        AppArmor userlevel parser utility
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
 Obsoletes:      libimnxcert < 2.9
 Obsoletes:      subdomain-leaf-cert < 2.9
@@ -142,7 +142,7 @@ SubDomain.
 
 %package docs
 Summary:        AppArmor Documentation package
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Documentation/Other
 BuildArch:      noarch
 
@@ -156,7 +156,7 @@ SubDomain.
 
 %package -n apache2-mod_apparmor
 Summary:        AppArmor module for apache2
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Security
 
 %description -n apache2-mod_apparmor
@@ -175,7 +175,7 @@ The documentation is in the apparmor-admin_en package.
 
 %package -n perl-apparmor
 Summary:        Perl interface for libapparmor functions
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Development/Libraries/Perl
 Requires:       libapparmor1 = %{version}
 Requires:       perl = %{perl_version}
@@ -192,7 +192,7 @@ applications interfacing with AppArmor.
 
 %package -n python-apparmor
 Summary:        Python 2 interface for libapparmor functions
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Development/Libraries/Python
 BuildRequires:  python
 Requires:       libapparmor1 = %{version}
@@ -211,7 +211,7 @@ applications interfacing with AppArmor.
 
 %package -n python3-apparmor
 Summary:        Python 3 interface for libapparmor functions
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Development/Libraries/Python
 Requires:       libapparmor1 = %{version}
 Requires:       python = %{py3_ver}
@@ -228,7 +228,7 @@ applications interfacing with AppArmor.
 
 %package -n ruby-apparmor
 Summary:        Ruby interface for libapparmor functions
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Development/Languages/Ruby
 Requires:       libapparmor1 = %{version}
 Requires:       ruby = %(rpm -q --qf '%%{version}' ruby)
@@ -243,7 +243,7 @@ applications interfacing with AppArmor.
 
 %package abstractions
 Summary:        AppArmor abstractions and directory structure
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Productivity/Security
 Requires:       apparmor-parser(CAP_SYSLOG)
 BuildArch:      noarch
@@ -262,7 +262,7 @@ SubDomain.
 
 %package profiles
 Summary:        AppArmor profiles that are loaded into the apparmor kernel module
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Productivity/Security
 Requires:       apparmor-abstractions >= %{version}
 Requires:       apparmor-parser(CAP_SYSLOG)
@@ -281,7 +281,7 @@ SubDomain.
 
 %package utils
 Summary:        AppArmor User-Level Utilities Useful for Creating AppArmor Profiles
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Productivity/Security
 Requires:       libapparmor1 = %{version}
 # some of the tools are still perl-based (aa-decode and aa-notify)
@@ -310,7 +310,7 @@ It is part of a suite of tools that used to be named SubDomain.
 
 %package -n tomcat_apparmor
 Summary:        Tomcat 6 plugin for AppArmor change_hat
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          System/Libraries
 Requires:       libapparmor1 = %{version}
 Requires:       tomcat6
@@ -328,7 +328,7 @@ created for individual URL processing or per servlet.
 
 %package -n pam_apparmor
 Summary:        PAM module for AppArmor change_hat
-License:        GPL-2.0 AND LGPL-2.1+
+License:        GPL-2.0-only AND LGPL-2.1-or-later
 Group:          Productivity/Security
 BuildRequires:  pam-devel
 PreReq:         pam
diff --git a/libapparmor.spec b/libapparmor.spec
index b1e0b21..3ce608f 100644
--- a/libapparmor.spec
+++ b/libapparmor.spec
@@ -21,7 +21,7 @@ Name:           libapparmor
 Version:        2.12
 Release:        0
 Summary:        Utility library for AppArmor
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Url:            https://launchpad.net/apparmor
 Source0:        apparmor-%{version}.tar.gz