[389-dsgw/f15: 6/6] Merge branch 'f16' into f15

[Richard Allen Megginson]

commit 5b27fed22dcd2e159871fe867d0ac27f2cbd41ec
Merge: 4ae5123 e0f5074
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Dec 15 12:11:50 2011 -0700

    Merge branch 'f16' into f15
    
    Conflicts:
    	.gitignore
    	389-dsgw.spec
    	sources

 .gitignore    |    1 +
 389-dsgw.spec |   11 +++++++++--
 sources       |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---
diff --cc 389-dsgw.spec
index 8c6763a,516a022..ff421fb
--- a/389-dsgw.spec
+++ b/389-dsgw.spec
@@@ -82,10 -85,17 +85,14 @@@ f
  %{_datadir}/%{pkgname}/properties/dsgw
  %{_sbindir}/*
  %{_libdir}/%{pkgname}/dsgw-cgi-bin
+ %ghost %{_sysconfdir}/tmpfiles.d/%{pkgname}-dsgw.conf
  
  %changelog
+ * Wed Dec 14 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.8-1
+ - add support for tmpfiles.d
+ 
 -* Wed Nov  2 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-3
 -- rebuild with new 389-adminutil and ICU
 -
 -* Wed Sep 14 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
 -- rebuild with new 389-adminutil in stable
 +* Thu Jun 30 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-2
 +- bump rel to rebuild with 389-adminutil-1.1.14
  
  * Tue Jun 28 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.7-1
  - look for separate openldap ldif library