From 0a9b211e8c0a6834056719e093b3a81cc9d4008e Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jvcelak@redhat.com>
Date: Tue, 25 Oct 2011 18:23:00 +0200
Subject: [PATCH] specfile: reorder sources

---
 openldap.spec | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/openldap.spec b/openldap.spec
index 8750d71..b90d5e7 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
-%define evolution_connector_prefix %{_libdir}/evolution-openldap
-%define evolution_connector_includedir %{evolution_connector_prefix}/include
-%define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
+%global evolution_connector_prefix %{_libdir}/evolution-openldap
+%global evolution_connector_includedir %{evolution_connector_prefix}/include
+%global evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
 
 Name: openldap
 Version: 2.4.26
@@ -12,11 +12,15 @@ Group: System Environment/Daemons
 License: OpenLDAP
 URL: http://www.openldap.org/
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
-Source1: ldap.init
-Source2: ldap.sysconfig
-Source3: README.evolution
-Source4: ldap.tmpfiles
-Source5: slapd.conf
+Source1: slapd.service
+Source2: slapd.sysconfig
+Source3: slapd.tmpfiles
+Source4: slapd.conf
+Source50: slapd-libexec-functions
+Source51: slapd-libexec-convert-config.sh
+Source52: slapd-libexec-check-config.sh
+Source53: slapd-libexec-upgrade-db.sh
+Source100: README.evolution
 
 # patches for 2.4
 Patch0: openldap-manpages.patch
@@ -294,7 +298,7 @@ make install DESTDIR=%{buildroot} \
     libdir=%{evolution_connector_libdir} \
     LIBTOOL="$libtool" \
     STRIP=""
-install -m 644 %SOURCE3 \
+install -m 644 %SOURCE100 \
     %{buildroot}/%{evolution_connector_prefix}/
 popd
 
@@ -312,11 +316,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/pki/tls/certs
 
 # setup data and runtime directories
 mkdir -p %{buildroot}/var/lib/ldap
-mkdir -p %{buildroot}/var/run/openldap
 
 # setup autocreation of runtime directories on tmpfs
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 644 %SOURCE4 %{buildroot}%{_sysconfdir}/tmpfiles.d/openldap.conf
+install -m 644 %SOURCE3 %{buildroot}%{_sysconfdir}/tmpfiles.d/slapd.conf
 
 # remove build root from config files and manual pages
 perl -pi -e "s|%{buildroot}||g" %{buildroot}/%{_sysconfdir}/openldap/*.conf
@@ -332,7 +335,7 @@ install -m 755 %SOURCE1 %{buildroot}%{_sysconfdir}/rc.d/init.d/slapd
 
 # install syconfig/ldap
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-install -m 644 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/ldap
+install -m 644 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/slapd
 
 # move slapd out of _libdir
 mv %{buildroot}/%{_libdir}/slapd %{buildroot}/%{_sbindir}/
@@ -351,7 +354,7 @@ chmod 644 %{buildroot}/%{_libdir}/lib*.*a
 mkdir -p %{buildroot}/%{_datadir}/openldap-servers
 mkdir %{buildroot}/%{_sysconfdir}/openldap/slapd.d
 rm -f %{buildroot}/%{_sysconfdir}/openldap/slapd.conf
-install -m 644 %SOURCE5 %{buildroot}/%{_datadir}/openldap-servers/slapd.conf.obsolete
+install -m 644 %SOURCE4 %{buildroot}/%{_datadir}/openldap-servers/slapd.conf.obsolete
 
 # move doc files out of _sysconfdir
 mv %{buildroot}%{_sysconfdir}/openldap/schema/README README.schema