From 0a9f5d7bc94824549b358bb9e52fe93effdab598 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 11 Jan 2013 17:55:26 +0100
Subject: [PATCH] - simplified nss-in-rootlib patch - dropped obsolete
 --with-distro option - pass --with-rc-local-script-path-stop (default is
 /usr/sbin/halt.local, we used /sbin/halt.local for distro=pld)

---
 nss-in-rootlib.patch | 21 +++++++--------------
 systemd.spec         | 40 ++++++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/nss-in-rootlib.patch b/nss-in-rootlib.patch
index cddf4c7..0559e5a 100644
--- a/nss-in-rootlib.patch
+++ b/nss-in-rootlib.patch
@@ -1,18 +1,11 @@
---- systemd-197/Makefile.am~	2013-01-10 13:47:07.559176765 +0100
-+++ systemd-197/Makefile.am	2013-01-11 11:37:03.702831120 +0100
-@@ -3591,6 +3591,15 @@
+--- systemd-197/Makefile.am.orig	2013-01-11 17:08:54.878788792 +0100
++++ systemd-197/Makefile.am	2013-01-11 17:10:25.442120239 +0100
+@@ -3589,7 +3589,7 @@
+ 	-shared \
+ 	-shrext .so.2
  
- lib_LTLIBRARIES += \
+-lib_LTLIBRARIES += \
++rootlib_LTLIBRARIES = \
  	libnss_myhostname.la
-+
-+libnss_myhostname-install-hook:
-+	mv $(DESTDIR)$(libdir)/libnss_myhostname.so.2 $(DESTDIR)$(rootlibdir)
-+
-+libnss_myhostname-uninstall-hook:
-+	rm -f $(DESTDIR)$(rootlibdir)/libnss_myhostname.so.2
-+
-+INSTALL_EXEC_HOOKS += libnss_myhostname-install-hook
-+UNINSTALL_EXEC_HOOKS += libnss_myhostname-uninstall-hook
  endif
  
- # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
diff --git a/systemd.spec b/systemd.spec
index 9e8e3b3..7fa5071 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -612,18 +612,9 @@ patch -p1 <%{PATCH100}
 	%{?with_dietlibc:CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -D_BSD_SOURCE"} \
 	%{?with_klibc:CC="%{_bindir}/klcc"} \
 	%{?debug:--enable-debug} \
-	--with-kbd-loadkeys=/usr/bin/loadkeys \
-	--with-kbd-setfont=/bin/setfont \
-	--with-sysvinit-path=/etc/rc.d/init.d \
-	--with-sysvrcnd-path=/etc/rc.d \
-	--with-rc-local-script-path-start=/etc/rc.d/rc.local \
-	--enable-chkconfig \
 	--disable-silent-rules \
 	--disable-shared \
 	--enable-static \
-	--with-distro=pld \
-	--with-rootprefix="" \
-	--with-rootlibdir=/%{_lib} \
 	--disable-audit \
 	--disable-gtk-doc \
 	--disable-gudev \
@@ -633,7 +624,16 @@ patch -p1 <%{PATCH100}
 	--disable-pam \
 	--disable-qrencode \
 	--disable-selinux \
-	--enable-split-usr
+	--enable-chkconfig \
+	--enable-split-usr \
+	--with-kbd-loadkeys=/usr/bin/loadkeys \
+	--with-kbd-setfont=/bin/setfont \
+	--with-sysvinit-path=/etc/rc.d/init.d \
+	--with-sysvrcnd-path=/etc/rc.d \
+	--with-rc-local-script-path-start=/etc/rc.d/rc.local \
+	--with-rc-local-script-path-stop=/sbin/halt.local \
+	--with-rootprefix="" \
+	--with-rootlibdir=/%{_lib}
 
 %{__make} \
 	libudev-core.la \
@@ -678,22 +678,21 @@ patch -p1 -R <%{PATCH100}
 	%{__enable_disable tcpd tcpwrap} \
 	%{__enable_disable microhttpd} \
 	%{__enable_disable qrencode} \
-	--with-kbd-loadkeys=/usr/bin/loadkeys \
-	--with-kbd-setfont=/bin/setfont \
-	--with-sysvinit-path=/etc/rc.d/init.d \
-	--with-sysvrcnd-path=/etc/rc.d \
-	--with-rc-local-script-path-start=/etc/rc.d/rc.local \
-	--enable-chkconfig \
 	--disable-silent-rules \
+	--enable-chkconfig \
 	--enable-gtk-doc \
 	--enable-introspection \
 	--enable-split-usr \
-	--enable-shared \
 	--enable-static \
-	--with-distro=pld \
+	--with-html-dir=%{_gtkdocdir} \
+	--with-kbd-loadkeys=/usr/bin/loadkeys \
+	--with-kbd-setfont=/bin/setfont \
+	--with-sysvinit-path=/etc/rc.d/init.d \
+	--with-sysvrcnd-path=/etc/rc.d \
+	--with-rc-local-script-path-start=/etc/rc.d/rc.local \
+	--with-rc-local-script-path-stop=/sbin/halt.local \
 	--with-rootprefix="" \
-	--with-rootlibdir=/%{_lib} \
-	--with-html-dir=%{_gtkdocdir}
+	--with-rootlibdir=/%{_lib}
 
 %{__make}
 ./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
@@ -834,6 +833,7 @@ install -d $RPM_BUILD_ROOT/var/log
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libnss_myhostname.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/systemd/*.la
 %py_postclean
-- 
2.44.0