From 5ef5dbff4cf83d6d8efdcdac5ef18d65aa2ad440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Kl=C3=AD=C4=8D?= <kklic@fedoraproject.org>
Date: Fri, 21 May 2010 12:27:21 +0000
Subject: [PATCH] Moved /sbin/ypbind to /usr/sbin/ypbind

---
 ypbind.init |  6 +++---
 ypbind.spec | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ypbind.init b/ypbind.init
index 16b0a9e..a8fcaf1 100755
--- a/ypbind.init
+++ b/ypbind.init
@@ -12,7 +12,7 @@
 # processname: ypbind
 # config: /etc/yp.conf
 #
-# See https://fedoraproject.org/wiki/Packaging:SysVInitScript for 
+# See https://fedoraproject.org/wiki/Packaging:SysVInitScript for
 # the guidelines document.
 
 OTHER_YPBIND_OPTS=""
@@ -34,7 +34,7 @@ OTHER_YPBIND_OPTS=""
 # Check that networking is configured.
 [ "${NETWORKING}" = "no" ] && exit 0
 
-exec="/sbin/ypbind"
+exec="/usr/sbin/ypbind"
 prog="ypbind"
 lockfile=/var/lock/subsys/$prog
 
@@ -187,7 +187,7 @@ case "$1" in
 	;;
     stop)
         rh_status_q || exit 0
-	$1	
+	$1
 	;;
     restart)
 	$1
diff --git a/ypbind.spec b/ypbind.spec
index 49111b5..bf61484 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.31
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -9,7 +9,6 @@ Url: http://www.linux-nis.org/nis/ypbind-mt/index.html
 Source1: ypbind.init
 Source2: nis.sh
 Patch1: ypbind-1.11-gettextdomain.patch
-
 Requires(post): chkconfig
 Requires(preun): chkconfig
 # This is for /sbin/service
@@ -41,7 +40,7 @@ also need to install the ypserv package to a machine on your network.
 %patch1 -p1 -b .gettextdomain
 
 %build
-%configure --sbindir=/sbin --enable-dbus-nm
+%configure --enable-dbus-nm
 make
 
 %install
@@ -71,7 +70,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-/sbin/ypbind
+%{_sbindir}/*
 %{_mandir}/*/*
 %{_initrddir}/*
 /etc/dhcp/dhclient.d/*
@@ -80,6 +79,12 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Fri May 21 2010 Karel Klic <kklic@redhat.com> - 3:1.31-5
+- Moved /sbin/ypbind to /usr/sbin/ypbind, as the package
+  depends on several utilities from /usr (selinuxenabled,
+  rpcinfo, ypwhich), and /usr/lib/libdbus-glib-1.so
+- Removed trailing whitespaces from ChangeLog
+
 * Wed May 19 2010 Karel Klic <kklic@redhat.com> - 3:1.31-4
 - Update SELinux context of /etc/yp.conf in nis.sh (rhbz#593278)
 - nis.sh: use condrestart instead of pidfile checking
@@ -97,10 +102,10 @@ fi
 * Mon Jan  4 2010 Karel Klic <kklic@redhat.com> - 3:1.31-1
 - Updated to version 1.31 from upstream
 - Removed signalstate patch because it was merged by upstream
-- Removed man-port patch, because it was rejected by 
-  the upstream. Option '-p' does not work in all cases, it 
-  is not supported, intentionally not included in 
-  the documentation, and it is also removed from the usage 
+- Removed man-port patch, because it was rejected by
+  the upstream. Option '-p' does not work in all cases, it
+  is not supported, intentionally not included in
+  the documentation, and it is also removed from the usage
   string in this version
 
 * Fri Nov 19 2009 Karel Klic <kklic@redhat.com> - 3:1.29.91-2
@@ -109,7 +114,7 @@ fi
 
 * Mon Oct 26 2009 Karel Klic <kklic@redhat.com> - 3:1.29.91-1
 - Updated to 1.29.91 from upstream
-- Removed 1.19-port-leak patch because the upstream source code has 
+- Removed 1.19-port-leak patch because the upstream source code has
   been changed and the port leaks should not happen anymore
 - Removed 1.20.4-smartwrite patch because it was merged by upstream
 - Removed 1.20.4-nm patch as the upstream merged the important part