[samba4] Further fixes for public headers

[Simo Sorce]

commit 8f5b8b01b7358148fdab0090743aea161bd32f33
Author: Simo Sorce <ssorce at redhat.com>
Date:   Wed Mar 16 12:30:46 2011 -0400

    Further fixes for public headers

 ...change-doesn-t-need-these-headers-any-mor.patch |   29 ++++++++++++++++++++
 samba4.spec                                        |   16 +++-------
 2 files changed, 34 insertions(+), 11 deletions(-)
---
diff --git a/0001-libcli-openchange-doesn-t-need-these-headers-any-mor.patch b/0001-libcli-openchange-doesn-t-need-these-headers-any-mor.patch
new file mode 100644
index 0000000..1254555
--- /dev/null
+++ b/0001-libcli-openchange-doesn-t-need-these-headers-any-mor.patch
@@ -0,0 +1,29 @@
+From 73e7b72936e966b0f1887ffe4c32689425d4a87a Mon Sep 17 00:00:00 2001
+From: Andrew Tridgell <tridge at samba.org>
+Date: Wed, 16 Mar 2011 08:47:11 +1100
+Subject: [PATCH] libcli: openchange doesn't need these headers any more
+
+thanks to Simo for pointing this out
+
+Autobuild-User: Andrew Tridgell <tridge at samba.org>
+Autobuild-Date: Wed Mar 16 00:25:10 CET 2011 on sn-devel-104
+---
+ libcli/security/wscript_build |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build
+index 5b4d61453cac7c4d5b44136e724fc6ed54a7a034..3f2e06a908ba8236f012ce155fad5a412d83e1c9 100644
+--- a/libcli/security/wscript_build
++++ b/libcli/security/wscript_build
+@@ -4,8 +4,6 @@
+ bld.SAMBA_LIBRARY('security',
+                   source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c session.c',
+                   private_library=True,
+-                  public_headers='security.h dom_sid.h secace.h secacl.h security_descriptor.h security_token.h sddl.h privileges.h access_check.h session.h',
+-                  header_path='security',
+                   deps='talloc ndr NDR_SECURITY'
+                   )
+ 
+-- 
+1.7.4
+
diff --git a/samba4.spec b/samba4.spec
index 5f3c996..d0d3e07 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -47,6 +47,7 @@ Source5: %{name}.init
 %endif
 
 Patch01: 0001-s4-auth-Remove-partly-implemented-libwbclient-module.patch
+Patch02: 0001-libcli-openchange-doesn-t-need-these-headers-any-mor.patch
 
 Requires(pre): /usr/sbin/groupadd
 
@@ -175,6 +176,7 @@ domains and to use Windows user and group accounts on Linux.
 # copy Red Hat specific scripts
 
 %patch01 -p1 -b .rm-libwbclient-dep
+%patch02 -p1 -b .unneded-headers
 
 %build
 %configure \
@@ -658,16 +660,7 @@ exit 0
 %{_includedir}/samba-4.0/util_ldb.h
 %{_includedir}/samba-4.0/dcerpc_server/proto.h
 %{_includedir}/samba-4.0/rpc_common.h
-%{_includedir}/samba-4.0/security/access_check.h
-%{_includedir}/samba-4.0/security/dom_sid.h
-%{_includedir}/samba-4.0/security/privileges.h
-%{_includedir}/samba-4.0/security/sddl.h
-%{_includedir}/samba-4.0/security/secace.h
-%{_includedir}/samba-4.0/security/secacl.h
-%{_includedir}/samba-4.0/security/security.h
-%{_includedir}/samba-4.0/security/security_descriptor.h
-%{_includedir}/samba-4.0/security/security_token.h
-%{_includedir}/samba-4.0/security/session.h
+%{_includedir}/samba-4.0/ndr/ndr_svcctl.h
 
 %if %enable_winbind
 %{_libdir}/libwbclient.so
@@ -710,8 +703,9 @@ exit 0
 %endif
 
 %changelog
-* Tue Mar 15 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-34.alpha15
+* Wed Mar 16 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-34.alpha15GITa6a722b
 - New snapshot with fixes for openchange builds
+- Additional patches to fix public headers install
 
 * Thu Mar 10 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-33.alpha15
 - Remove unneded dependency.