- License is dual (BSD/GPL); package COPYING containing BSD license text

- libapparmor epoch

Changed files:
    pam-pam_apparmor.spec -> 1.15

diff --git a/pam-pam_apparmor.spec b/pam-pam_apparmor.spec
index 21fb4bc583d88416fad843f67b217cf2342bc824..5ab570e82e5d83dacf57e7752a510caa5cba2063 100644 (file)
--- a/pam-pam_apparmor.spec
+++ b/pam-pam_apparmor.spec
@@ -5,12 +5,12 @@ Name:         pam-%{modulename}
 Version:       2.7.2
 Release:       1
 Epoch:         1
 Version:       2.7.2
 Release:       1
 Epoch:         1

-License:       GPL
+License:       BSD or GPL

 Group:         Base
 Source0:       http://launchpad.net/apparmor/2.7/%{version}/+download/apparmor-%{version}.tar.gz
 # Source0-md5: 2863e85bdfdf9ee35b83db6721fed1f1
 URL:           http://apparmor.wiki.kernel.org/
 Group:         Base
 Source0:       http://launchpad.net/apparmor/2.7/%{version}/+download/apparmor-%{version}.tar.gz
 # Source0-md5: 2863e85bdfdf9ee35b83db6721fed1f1
 URL:           http://apparmor.wiki.kernel.org/

-BuildRequires: libapparmor-devel >= %{version}
+BuildRequires: libapparmor-devel >= 1:%{version}

 BuildRequires: pam-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: pam-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -44,5 +44,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc changehat/pam_apparmor/README
+%doc changehat/pam_apparmor/{COPYING,README}

 %attr(755,root,root) /%{_lib}/security/pam_apparmor.so
 %attr(755,root,root) /%{_lib}/security/pam_apparmor.so