From a81fa1d09084bbcef43ca6f21cf26a0115817af82e60d8e5677ff94ff84f9016 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 6 Apr 2008 05:18:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=22

---
 openldap-rc.tgz          |  4 ++--
 openldap2-client.changes |  5 +++++
 openldap2-client.spec    | 15 +++++++--------
 openldap2.changes        |  5 +++++
 openldap2.spec           | 15 +++++++--------
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/openldap-rc.tgz b/openldap-rc.tgz
index 4b95817..9bbb0b1 100644
--- a/openldap-rc.tgz
+++ b/openldap-rc.tgz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84bacc3aed76e118b16d780980db56df1cc81dcb4644a429d34b7d7cb774bac4
-size 4836
+oid sha256:94dcf71cc90f27aa2843b724122b6fd0df61069bce2587bc2d3eb728802773d2
+size 4331
diff --git a/openldap2-client.changes b/openldap2-client.changes
index 2534c47..5ab47e7 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr  3 14:26:12 CEST 2008 - rhafer@suse.de
+
+- removed apparmor profile
+
 -------------------------------------------------------------------
 Mon Mar  3 08:50:18 CET 2008 - rhafer@suse.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 83e6c5a..31d2cc4 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -29,7 +29,7 @@ Summary:        OpenLDAP Client Utilities
 %endif
 AutoReqProv:    on
 Version:        2.4.8
-Release:        6
+Release:        15
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -56,6 +56,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n openldap2-back-perl
+License:        BSD 3-Clause
 Summary:        OpenLDAP Perl Back-End
 Requires:       openldap2 = %{version}
 AutoReqProv:    on
@@ -72,6 +73,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n openldap2-back-meta
+License:        BSD 3-Clause
 Summary:        OpenLDAP Meta Back-End
 Requires:       openldap2 = %{version}
 AutoReqProv:    on
@@ -91,6 +93,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n openldap2-devel
+License:        BSD 3-Clause
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
 AutoReqProv:    on
 Conflicts:      openldap-devel 
@@ -183,8 +186,6 @@ ln -sf ../../etc/init.d/ldap $RPM_BUILD_ROOT/usr/sbin/rcldap
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.d
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2/slapd.conf
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/
-install -m 644 apparmor/usr.lib.openldap.slapd $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so*
@@ -216,10 +217,6 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 #put filelists into files
 cat >openldap2.filelist <<EOF
 /var/adm/fillup-templates/sysconfig.openldap
-%dir %attr(-, root, root) %{_sysconfdir}/apparmor/
-%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/
-%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/extras/
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 %config /etc/init.d/ldap
 /etc/sysconfig/SuSEfirewall2.d/services/openldap
 /usr/sbin/rcldap
@@ -346,6 +343,8 @@ fi
 %endif
 
 %changelog
+* Thu Apr 03 2008 rhafer@suse.de
+- removed apparmor profile
 * Mon Mar 03 2008 rhafer@suse.de
 - revert last change and make libldap_r available again as some
   packages seem to directly rely on libldap_r. Assume they know
@@ -862,7 +861,7 @@ fi
 - small fixes for the YaST user schema
 * Tue Nov 11 2003 rhafer@suse.de
 - enabled SLP-support
-* Fri Oct 17 2003 kukuk@suse.de
+* Sat Oct 18 2003 kukuk@suse.de
 - Remove unused des from neededforbuild
 * Tue Sep 02 2003 mt@suse.de
 - Bugzilla #29859: fixed typo in sysconfig metadata,
diff --git a/openldap2.changes b/openldap2.changes
index 2534c47..5ab47e7 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr  3 14:26:12 CEST 2008 - rhafer@suse.de
+
+- removed apparmor profile
+
 -------------------------------------------------------------------
 Mon Mar  3 08:50:18 CET 2008 - rhafer@suse.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 52452fd..337eb20 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -29,7 +29,7 @@ Summary:        The OpenLDAP Server
 %endif
 AutoReqProv:    on
 Version:        2.4.8
-Release:        6
+Release:        15
 Source:         openldap-%{version}.tar.bz2
 Source1:        openldap-rc.tgz
 Source2:        addonschema.tar.gz
@@ -59,6 +59,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n openldap2-back-perl
+License:        BSD 3-Clause
 Summary:        OpenLDAP Perl Back-End
 Requires:       openldap2 = %{version}
 AutoReqProv:    on
@@ -75,6 +76,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n openldap2-back-meta
+License:        BSD 3-Clause
 Summary:        OpenLDAP Meta Back-End
 Requires:       openldap2 = %{version}
 AutoReqProv:    on
@@ -94,6 +96,7 @@ Authors:
     The OpenLDAP Project <project@openldap.org>
 
 %package      -n openldap2-devel
+License:        BSD 3-Clause
 Summary:        Libraries, Header Files and Documentation for OpenLDAP
 AutoReqProv:    on
 Conflicts:      openldap-devel 
@@ -186,8 +189,6 @@ ln -sf ../../etc/init.d/ldap $RPM_BUILD_ROOT/usr/sbin/rcldap
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.d
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2/slapd.conf
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/
-install -m 644 apparmor/usr.lib.openldap.slapd $RPM_BUILD_ROOT/%{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so*
@@ -219,10 +220,6 @@ rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 #put filelists into files
 cat >openldap2.filelist <<EOF
 /var/adm/fillup-templates/sysconfig.openldap
-%dir %attr(-, root, root) %{_sysconfdir}/apparmor/
-%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/
-%dir %attr(-, root, root) %{_sysconfdir}/apparmor/profiles/extras/
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/apparmor/profiles/extras/usr.lib.openldap.slapd
 %config /etc/init.d/ldap
 /etc/sysconfig/SuSEfirewall2.d/services/openldap
 /usr/sbin/rcldap
@@ -349,6 +346,8 @@ fi
 %endif
 
 %changelog
+* Thu Apr 03 2008 rhafer@suse.de
+- removed apparmor profile
 * Mon Mar 03 2008 rhafer@suse.de
 - revert last change and make libldap_r available again as some
   packages seem to directly rely on libldap_r. Assume they know
@@ -865,7 +864,7 @@ fi
 - small fixes for the YaST user schema
 * Tue Nov 11 2003 rhafer@suse.de
 - enabled SLP-support
-* Fri Oct 17 2003 kukuk@suse.de
+* Sat Oct 18 2003 kukuk@suse.de
 - Remove unused des from neededforbuild
 * Tue Sep 02 2003 mt@suse.de
 - Bugzilla #29859: fixed typo in sysconfig metadata,