Accepting request 142683 from home:a_jaeger:my-factory-packages

Remove nscd init script, use systemd files.

OBS-URL: https://build.opensuse.org/request/show/142683
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=232

glibc.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov 24 13:48:40 UTC 2012 - aj@suse.de
+
+- Remove nscd init script, use systemd files.
+
 -------------------------------------------------------------------
 Fri Nov 23 14:33:37 UTC 2012 - matz@suse.com
 

glibc.spec

@@ -33,6 +33,7 @@ BuildRequires:  fdupes
 BuildRequires:  libselinux-devel
 BuildRequires:  makeinfo
 BuildRequires:  xz
+BuildRequires:  pkgconfig(systemd)
 %if %{with glibc_run_testsuite}
 BuildRequires:  gcc-c++
 BuildRequires:  libstdc++-devel
@@ -129,7 +130,6 @@ Source:         glibc-%{version}-%{git_id}.tar.xz
 Source3:        noversion.tar.bz2
 Source4:        manpages.tar.bz2
 Source5:        nsswitch.conf
-Source6:        nscd.init
 Source7:        bindresvport.blacklist
 Source8:        glibc_post_upgrade.c
 Source9:        glibc.rpmlintrc
@@ -315,12 +315,9 @@ Locale data for the internationalisation features of the GNU C library.
 Summary:        Name Service Caching Daemon
 License:        GPL-2.0+
 Group:          System/Daemons
-Provides:       aaa_base:/etc/init.d/nscd
 Provides:       glibc:/usr/sbin/nscd
 Requires:       glibc = %{version}
-Requires(preun): %insserv_prereq
+%{?systemd_requires}
-Requires(post): %insserv_prereq
-Requires(postun): %insserv_prereq
 
 %description -n nscd
 Nscd caches name service lookups and can dramatically improve
@@ -901,8 +898,7 @@ popd
 
 cp nscd/nscd.conf %{buildroot}/etc
 mkdir -p %{buildroot}/etc/init.d
-install -m 755 %{SOURCE6} %{buildroot}/etc/init.d/nscd
+ln -sf /sbin/service %{buildroot}/usr/sbin/rcnscd
-ln -sf /etc/init.d/nscd %{buildroot}/usr/sbin/rcnscd
 mkdir -p %{buildroot}/var/run/nscd
 touch %{buildroot}/var/run/nscd/{passwd,group,hosts}
 touch %{buildroot}/var/run/nscd/{socket,nscd.pid}
@@ -1000,12 +996,14 @@ done
 %postun info
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
-%preun -n nscd
+%pre -n nscd
+%service_add_pre nscd.service
 
-%stop_on_removal nscd
+%preun -n nscd
+%service_del_preun nscd.service
 
 %post -n nscd
-%{insserv_force_if_yast nscd}
+%service_add_post nscd.service
 mkdir -p /var/run/nscd
 # Previously we had nscd.socket, remove it
 test -x /usr/bin/systemctl && /usr/bin/systemctl stop nscd.socket || :
@@ -1015,8 +1013,7 @@ rm -f /etc/systemd/system/sockets.target.wants/nscd.socket
 exit 0
 
 %postun -n nscd
-%restart_on_update nscd
+%service_del_postun nscd.service
-%insserv_cleanup
 exit 0
 
 #######################################################################
@@ -1243,7 +1240,6 @@ exit 0
 %files -n nscd
 %defattr(-,root,root)
 %config(noreplace) /etc/nscd.conf
-%config /etc/init.d/nscd
 %{_sbindir}/nscd
 %{_sbindir}/rcnscd
 /lib/systemd/system/nscd.service