From 6f5b1ad8c234d58041e45aef4558d50f44d7f021 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Thu, 26 Feb 2009 10:13:52 +0100
Subject: Create and own /var/lib/sss, memberof.so packaging

Own everything in /usr/libexec/sssd in specfile, no nss_client subdir
Place memberof.so in /usr/lib/ldb
---
 Makefile           |  2 +-
 server/Makefile.in | 19 ++++++++++++++-----
 sssd.spec          |  6 +++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e2c14ce3f..8a38214f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PACKAGE_NAME = sssd
 PACKAGE_VERSION = 0.1.0
 TARGET ?= master
-SUBDIRS = server replace nss_client
+SUBDIRS = server replace sss_client
 TARBALL_PREFIX = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 TARBALL = $(TARBALL_PREFIX).tar.gz
 LIBDIR ?= /usr/lib
diff --git a/server/Makefile.in b/server/Makefile.in
index bd320e3af..dd64b7eeb 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -10,6 +10,7 @@ libexecdir = @libexecdir@
 bindir = @bindir@
 sbindir = @sbindir@
 mandir = @mandir@
+localstatedir = @localstatedir@
 VPATH = @srcdir@:@libreplacedir@
 srcdir = @srcdir@
 builddir = @builddir@
@@ -18,9 +19,12 @@ INSTALLCMD = @INSTALL@
 EXTRA_OBJ=@EXTRA_OBJ@
 SSSD_LIBEXEC_PATH = @SSSD_LIBEXEC_PATH@
 SSSD_LIBDIR = $(libdir)/@PACKAGE_NAME@
+LDB_LIBDIR = $(libdir)/ldb
 SSSD_INTROSPECT_PATH = @SSSD_INTROSPECT_PATH@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 srvdir = $(srcdir)
+pipepath = @pipepath@
+dbpath = @dbpath@
 
 TALLOC_LIBS = @TALLOC_LIBS@
 TALLOC_CFLAGS = @TALLOC_CFLAGS@
@@ -117,7 +121,8 @@ BINS = sbin/sssd $(LIBEXECBINS)
 TESTS = tests/sysdb-tests tests/infopipe-tests
 TESTS_DATA = tests/tests.ldb tests/tests_conf.ldb tests/introspect.ref
 
-SOLIBS = lib/$(MEMBEROF_SOLIB) lib/$(PROXY_BE_SOLIB) lib/$(LDAP_BE_SOLIB)
+SOLIBS = lib/$(PROXY_BE_SOLIB) lib/$(LDAP_BE_SOLIB)
+LDBLIBS = lib/$(MEMBEROF_SOLIB)
 SONAMELIBS = lib/$(PROXY_BE_SONAME) lib/$(MEMBEROF_SONAME) lib/$(LDAP_BE_SONAME)
 SOBASELIBS = lib/$(PROXY_BE_SOBASE) lib/$(MEMBEROF_SOBASE) lib/$(LDAP_BE_SOBASE)
 
@@ -137,7 +142,7 @@ clean:: testclean
 	rm -f $(OBJS) $(BINS) $(MODULES)
 	rm -f *.o */*.o */*/*.o
 	rm -f $(BINS)
-	rm -f $(SOBASELIBS) $(SONAMELIBS) $(SOLIBS)
+	rm -f $(SOBASELIBS) $(SONAMELIBS) $(SOLIBS) $(LDBLIBS)
 
 distclean:: clean
 	rm -rf $(DIRS)
@@ -161,8 +166,11 @@ installdirs::
 	          $(DESTDIR)$(libdir) \
 	          $(DESTDIR)$(sbindir) \
 		  $(DESTDIR)$(SSSD_LIBDIR) \
+		  $(DESTDIR)$(LDB_LIBDIR) \
 	          $(DESTDIR)$(DBUS_SYSBUS_POLICY_DIR) \
-	          $(DESTDIR)$(SSSD_INTROSPECT_PATH)/infopipe
+	          $(DESTDIR)$(SSSD_INTROSPECT_PATH)/infopipe \
+		  $(DESTDIR)$(pipepath)/private \
+		  $(DESTDIR)$(dbpath)
 
 installheaders:: installdirs
 ifneq (x$(headers), x)
@@ -174,12 +182,13 @@ ifneq (x$(STATICLIB)$(LIBSOLIB), x)
 	cp $(STATICLIB) $(LIBSOLIB) $(DESTDIR)$(SSSD_LIBDIR)
 endif
 	${INSTALLCMD} -m 755 $(SOLIBS) $(DESTDIR)$(SSSD_LIBDIR)
+	${INSTALLCMD} -m 755 $(LDBLIBS) $(DESTDIR)$(LDB_LIBDIR)
 	ln -fs $(PROXY_BE_SOLIB) $(DESTDIR)$(SSSD_LIBDIR)/$(PROXY_BE_SONAME)
 	ln -fs $(PROXY_BE_SOLIB) $(DESTDIR)$(SSSD_LIBDIR)/$(PROXY_BE_SOBASE)
 	ln -fs $(LDAP_BE_SOLIB) $(DESTDIR)$(SSSD_LIBDIR)/$(LDAP_BE_SONAME)
 	ln -fs $(LDAP_BE_SOLIB) $(DESTDIR)$(SSSD_LIBDIR)/$(LDAP_BE_SOBASE)
-	ln -fs $(MEMBEROF_SOLIB) $(DESTDIR)$(SSSD_LIBDIR)/$(MEMBEROF_SONAME)
-	ln -fs $(MEMBEROF_SOLIB) $(DESTDIR)$(SSSD_LIBDIR)/$(MEMBEROF_SOBASE)
+	ln -fs $(MEMBEROF_SOLIB) $(DESTDIR)$(LDB_LIBDIR)/$(MEMBEROF_SONAME)
+	ln -fs $(MEMBEROF_SOLIB) $(DESTDIR)$(LDB_LIBDIR)/$(MEMBEROF_SOBASE)
 
 installbin:: installdirs
 
diff --git a/sssd.spec b/sssd.spec
index b874568bc..7ad8e6a5b 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -62,10 +62,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_sbindir}/sssd
-%{_libexecdir}/sssd/sssd_nss
-%{_libexecdir}/sssd/sssd_dp
-%{_libexecdir}/sssd/sssd_be
+%{_libexecdir}/%{name}/
 %{_libdir}/%{name}/
+%{_libdir}/ldb/memberof.so*
+%{_sharedstatedir}/sss/
 # infopipe files
 %{_libexecdir}/sssd/sssd_info
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freeipa.sssd.infopipe.conf
-- 
cgit