From 443ffdd1942c42272a6d3ac1a4fe7c2c479fae03 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Mon, 27 Apr 2015 15:20:45 +0200
Subject: [PATCH] fix: bring back tmpfiles config (#1215655)

This reverts commit 521bbc2942b58a8147cf230d89df5bca64904073.
---
 openldap.spec  | 11 ++++++++++-
 slapd.tmpfiles |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 slapd.tmpfiles

diff --git a/openldap.spec b/openldap.spec
index 7cfe45f..58d21eb 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,13 +5,14 @@
 
 Name: openldap
 Version: 2.4.40
-Release: 11%{?dist}
+Release: 12%{?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
@@ -267,6 +268,10 @@ 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
@@ -480,6 +485,7 @@ 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
@@ -536,6 +542,9 @@ exit 0
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 27 2015 Jan Synáček <jsynacek@redhat.com> - 2.4.40-12
+- fix: bring back tmpfiles config (#1215655)
+
 * Mon Mar 30 2015 Jan Synáček <jsynacek@redhat.com> - 2.4.40-11
 - remove spurious ghosted file
 
diff --git a/slapd.tmpfiles b/slapd.tmpfiles
new file mode 100644
index 0000000..56aa32e
--- /dev/null
+++ b/slapd.tmpfiles
@@ -0,0 +1,2 @@
+# openldap runtime directory for slapd.arg and slapd.pid
+d /var/run/openldap 0755 ldap ldap -