From 6afb284f7c7f1ede23bc050913281d9cb5a6edca00841ea0bd436c273a2b043f Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <ralf@h4kamp.de>
Date: Wed, 31 Mar 2010 14:03:25 +0000
Subject: [PATCH] - Package pam- and nss-Modules as baselibs - cleaned up file
 list and dependencies - fixed init script dependencies

OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=14
---
 0004-init-script-dependencies.patch | 29 +++++++++++++++++++++++++++++
 baselibs.conf                       |  4 ++++
 sssd.changes                        |  7 +++++++
 sssd.spec                           | 16 ++++++++++------
 4 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 0004-init-script-dependencies.patch
 create mode 100644 baselibs.conf

diff --git a/0004-init-script-dependencies.patch b/0004-init-script-dependencies.patch
new file mode 100644
index 0000000..326a9c2
--- /dev/null
+++ b/0004-init-script-dependencies.patch
@@ -0,0 +1,29 @@
+From b9090cb4d12147267a4fb1ad9bb74bb226bcbe34 Mon Sep 17 00:00:00 2001
+From: Ralf Haferkamp <rhafer@suse.de>
+Date: Wed, 31 Mar 2010 12:21:21 +0200
+Subject: [PATCH] init script dependencies
+
+---
+ src/sysv/SUSE/sssd |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sysv/SUSE/sssd b/src/sysv/SUSE/sssd
+index 2f98c21..262ecde 100644
+--- a/src/sysv/SUSE/sssd
++++ b/src/sysv/SUSE/sssd
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+ ### BEGIN INIT INFO
+ # Provides: sssd
+-# Required-Start: $remote_fs $time
++# Required-Start: $network $remote_fs $time
+ # Should-Start: $syslog
+ # Should-Stop: $syslog
+-# Required-Stop: $remote_fs
++# Required-Stop: $network $remote_fs $time
+ # Default-Start:     3 5
+ # Default-Stop:      0 1 2 4 6
+ # Short-Description: System Security Services Daemon
+-- 
+1.7.0.2
+
diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..22e0a35
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,4 @@
+sssd
+  supplements "packageand(sssd:pam-<targettype>)"
+  supplements "packageand(sssd:glibc-<targettype>)"
+  -/usr/lib(64)?/*
diff --git a/sssd.changes b/sssd.changes
index 7110fbd..2cf79d0 100644
--- a/sssd.changes
+++ b/sssd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 31 14:02:43 UTC 2010 - rhafer@novell.com
+
+- Package pam- and nss-Modules as baselibs
+- cleaned up file list and dependencies
+- fixed init script dependencies
+
 -------------------------------------------------------------------
 Wed Mar 31 07:57:25 UTC 2010 - rhafer@novell.com
 
diff --git a/sssd.spec b/sssd.spec
index 3747c44..f56f422 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -25,9 +25,11 @@ Summary:        System Security Services Daemon
 License: GPLv3+ and LGPLv3+
 URL: https://fedorahosted.org/sssd/
 Source0: %{name}-%{version}.tar.gz
+Source1: baselibs.conf
 Patch1: 0001-Added-option-to-use-libcrypto-instead-of-NSS.patch
 Patch2: 0002-Improvements-for-LDAP-Password-Policy-support.patch
 Patch3: 0003-ldap-provider-ld-flags.patch
+Patch4: 0004-init-script-dependencies.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 %define dhash_version 0.4.0
@@ -115,7 +117,7 @@ time properties
 Summary: Development files for libdhash
 Group: Development/Libraries/C and C++
 Version: %{dhash_version}
-Requires: libdhash1 = %{dhash_version}-%{release}
+Requires: libdhash1 = %{dhash_version}
 License: LGPLv3+
 
 %description -n libdhash-devel
@@ -136,7 +138,7 @@ and serialization
 Summary: Development files for libcollection
 Group: Development/Libraries/C and C++
 Version: %{collection_version}
-Requires: libcollection1 = %{collection_version}-%{release}
+Requires: libcollection1 = %{collection_version}
 License: LGPLv3+
 
 %description -n libcollection-devel
@@ -157,7 +159,7 @@ structure
 Summary: Development files for libini_config
 Group: Development/Libraries/C and C++
 Version: %{ini_config_version}
-Requires: libini_config1 = %{ini_config_version}-%{release}
+Requires: libini_config1 = %{ini_config_version}
 License: LGPLv3+
 
 %description -n libini_config-devel
@@ -169,6 +171,7 @@ structure
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 autoreconf
@@ -263,9 +266,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_initrddir}/%{name}
 %{_sbindir}/sssd
 %{_sbindir}/rcsssd
-%{_libexecdir}/%{servicename}/
-#%{_libdir}/*.so.*
-%dir %{_libdir}/%{name}/
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/sss*
+%{_libdir}/%{name}/*_child
+%{_libdir}/%{name}/upgrade_config.py
 %{_libdir}/%{name}/libsss_krb5*
 %{_libdir}/%{name}/libsss_ldap*
 %{_libdir}/%{name}/libsss_proxy*