From 547646c049cc49375ef245b7168449b597548c86d66da3efc2d62e0b62a30151 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 18 Jun 2012 12:07:06 +0000
Subject: [PATCH] Accepting request 125290 from home:a_jaeger:devel-glibc

Remove nscd.socket.

OBS-URL: https://build.opensuse.org/request/show/125290
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=189
---
 glibc.changes | 6 ++++++
 glibc.spec    | 3 ---
 nscd.service  | 2 +-
 nscd.socket   | 8 --------
 4 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 nscd.socket

diff --git a/glibc.changes b/glibc.changes
index c96dcb8..df4c3d1 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 18 11:04:37 UTC 2012 - aj@suse.de
+
+- Remove nscd.socket since nscd does not support socket
+  activation.
+
 -------------------------------------------------------------------
 Wed Jun 13 11:07:15 UTC 2012 - aj@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 143c032..56e1be0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -136,7 +136,6 @@ Source10:       baselibs.conf
 # For systemd 
 Source20:       nscd.conf
 Source21:       nscd.service
-Source22:       nscd.socket
 # crypt_blowfish
 Source50:       http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz
 Source51:       http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign
@@ -1036,7 +1035,6 @@ mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
 install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p %{buildroot}/lib/systemd/system
 install -m 644 %{SOURCE21} %{buildroot}/lib/systemd/system
-install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system
 
 %ifarch armv7l armv7hl
 # Provide compatibility link
@@ -1319,7 +1317,6 @@ exit 0
 %{_sbindir}/nscd
 %{_sbindir}/rcnscd
 /lib/systemd/system/nscd.service
-/lib/systemd/system/nscd.socket
 %dir /usr/lib/tmpfiles.d
 /usr/lib/tmpfiles.d/nscd.conf
 %dir %attr(0755,root,root) %ghost /var/run/nscd
diff --git a/nscd.service b/nscd.service
index a4a25d0..4734948 100644
--- a/nscd.service
+++ b/nscd.service
@@ -14,4 +14,4 @@ Restart=always
 
 [Install]
 WantedBy=multi-user.target
-Also=nscd.socket
+
diff --git a/nscd.socket b/nscd.socket
deleted file mode 100644
index cec9134..0000000
--- a/nscd.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon Socket
-
-[Socket]
-ListenDatagram=/var/run/nscd/socket
- 
-[Install]
-WantedBy=sockets.target