diff --git a/openldap.spec b/openldap.spec index a460306..aaabb14 100644 --- a/openldap.spec +++ b/openldap.spec @@ -5,14 +5,13 @@ Name: openldap Version: 2.4.40 -Release: 6%{?dist} +Release: 7%{?dist} Summary: LDAP support libraries Group: System Environment/Daemons License: OpenLDAP URL: http://www.openldap.org/ Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz Source1: slapd.service -Source2: slapd.tmpfiles Source3: slapd.ldif Source4: ldap.conf Source10: ltb-project-openldap-ppolicy-check-password-%{check_password_version}.tar.gz @@ -265,10 +264,6 @@ mkdir -p %{buildroot}%{_localstatedir} install -m 0700 -d %{buildroot}%{_sharedstatedir}/ldap install -m 0755 -d %{buildroot}%{_localstatedir}/run/openldap -# setup autocreation of runtime directories on tmpfs -mkdir -p %{buildroot}%{_tmpfilesdir} -install -m 0644 %SOURCE2 %{buildroot}%{_tmpfilesdir}/slapd.conf - # install default ldap.conf (customized) rm -f %{buildroot}%{_sysconfdir}/openldap/ldap.conf install -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/openldap/ldap.conf @@ -485,7 +480,6 @@ exit 0 %config(noreplace) %dir %attr(0750,ldap,ldap) %{_sysconfdir}/openldap/slapd.d %config(noreplace) %{_sysconfdir}/openldap/schema %config(noreplace) %{_sysconfdir}/openldap/check_password.conf -%{_tmpfilesdir}/slapd.conf %dir %attr(0700,ldap,ldap) %{_sharedstatedir}/ldap %dir %attr(-,ldap,ldap) %{_localstatedir}/run/openldap %{_unitdir}/slapd.service @@ -545,6 +539,9 @@ exit 0 %{_mandir}/man3/* %changelog +* Mon Jan 26 2015 Jan Synáček - 2.4.40-7 +- remove tmpfiles config since it's no longer needed + * Fri Jan 16 2015 Jan Synáček - 2.4.40-6 - remove openldap-fedora-systemd.patch - remove openldap-ldaprc-currentdir.patch diff --git a/slapd.tmpfiles b/slapd.tmpfiles deleted file mode 100644 index 56aa32e..0000000 --- a/slapd.tmpfiles +++ /dev/null @@ -1,2 +0,0 @@ -# openldap runtime directory for slapd.arg and slapd.pid -d /var/run/openldap 0755 ldap ldap -