rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

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

Browse Source 
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
This commit is contained in:
Andreas Jaeger 2012-11-24 14:18:54 +00:00 committed by Git OBS Bridge
parent 554abb20de
commit 31d00d1491
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc.changes
View File

@ -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 Fri Nov 23 14:33:37 UTC 2012 - matz@suse.com

22
glibc.spec
View File

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