Hello community,

here is the log from the commit of package openldap2 for openSUSE:Factory 
checked in at 2016-06-29 15:08:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openldap2 (Old)
 and      /work/SRC/openSUSE:Factory/.openldap2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openldap2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/openldap2/openldap2.changes      2016-05-20 
11:55:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2.changes 2016-06-29 
15:08:49.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Jun 16 10:10:36 UTC 2016 - [email protected]
+
+- Move schema files into tarball addonschema.tar.gz:
+  ldapns.ldif ldapns.schema rfc2307bis.ldif rfc2307bis.schema
+  yast.ldif yast.schema
+- Package previously missing schema files in LDIF format:
+  amavisd-new.ldif dhcp.ldif dlz.ldif dnszone.ldif samba3.ldif
+  sudo.ldif suse-mailserver.ldif (bsc#984691)
+- Fix a minor issue in schema2ldif script that led to missing
+  attribute in the generated LDIF.
+
+-------------------------------------------------------------------

Old:
----
  ldapns.ldif
  ldapns.schema
  rfc2307bis.ldif
  rfc2307bis.schema
  yast.ldif
  yast.schema

New:
----
  addonschema.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openldap2.spec ++++++
--- /var/tmp/diff_new_pack.oDYeAO/_old  2016-06-29 15:08:50.000000000 +0200
+++ /var/tmp/diff_new_pack.oDYeAO/_new  2016-06-29 15:08:50.000000000 +0200
@@ -44,17 +44,12 @@
 Source5:        README.module-loading
 Source6:        schema2ldif
 Source7:        baselibs.conf
-Source9:        ldapns.schema
-Source10:       rfc2307bis.schema
-Source11:       yast.schema
+Source9:        addonschema.tar.gz
 Source12:       slapd.conf.example
 Source13:       start
 Source14:       slapd.service
 Source15:       SuSEfirewall2.openldap
 Source16:       sysconfig.openldap
-Source17:       ldapns.ldif
-Source18:       rfc2307bis.ldif
-Source19:       yast.ldif
 Patch3:         0003-LDAPI-socket-location.dif
 Patch5:         0005-pie-compile.dif
 Patch6:         0006-No-Build-date-and-time-in-binaries.dif
@@ -251,7 +246,7 @@
 gzip -k %{S:203}
 
 # Unpack and patch OpenLDAP 2.4
-%setup -q -n openldap-%{version_main}
+%setup -q -a 9 -n openldap-%{version_main}
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
@@ -382,12 +377,8 @@
 
 mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates
 install -m 644 %{SOURCE16} 
${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.openldap
-install -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
-install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
-install -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
-install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
-install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
-install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
+install -m 644 *.ldif ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
+install -m 644 *.schema ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
 # Install default and sample configuration files
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap
 install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap

++++++ schema2ldif ++++++
--- /var/tmp/diff_new_pack.oDYeAO/_old  2016-06-29 15:08:51.000000000 +0200
+++ /var/tmp/diff_new_pack.oDYeAO/_new  2016-06-29 15:08:51.000000000 +0200
@@ -44,6 +44,7 @@
        $1 = tolower($1) ;
        gsub("^objectclass$","olcObjectclasses:",$1)
        gsub("^attributetype$","olcAttributeTypes:",$1)
+       gsub("^attributetypes$","olcAttributeTypes:",$1)
        gsub("^objectidentifier$","olcObjectIdentifier:",$1)
         buffer = $0;
 }


Reply via email to