rpms/ypserv/devel ypserv.spec,1.45,1.46

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/ypserv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30338

Modified Files:
	ypserv.spec 
Log Message:
Removed Prereq and RPM_SOURCE_DIR from spec file


Index: ypserv.spec
===================================================================
RCS file: /cvs/extras/rpms/ypserv/devel/ypserv.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ypserv.spec	5 Jan 2010 11:00:17 -0000	1.45
+++ ypserv.spec	7 Jan 2010 10:25:01 -0000	1.46
@@ -4,15 +4,21 @@ Summary: The NIS (Network Information Se
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
 Source1: ypserv-ypserv.init
 Source2: ypserv-yppasswdd.init
 Source3: ypserv-ypxfrd.init
+
 Requires: gawk, make, portmap, bash >= 2.0
-Prereq: /sbin/chkconfig /sbin/service
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# This is for /sbin/service
+Requires(preun): initscripts
+Requires(postun): initscripts
+
 Patch0: ypserv-2.5-redhat.patch
 Patch1: ypserv-2.11-path.patch
 Patch2: ypserv-2.5-nfsnobody2.patch
@@ -27,7 +33,7 @@ Patch11: ypserv-2.19-debuginfo.patch
 Patch12: ypserv-2.19-slp-warning.patch
 Obsoletes: yppasswd
 BuildRequires: gdbm-devel
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Network Information Service (NIS) is a system that provides
@@ -77,9 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir}/yp INSTALL_PROGRAM=install
 mkdir -p $RPM_BUILD_ROOT%{initdir}
 install -m644 etc/ypserv.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -m755 $RPM_SOURCE_DIR/ypserv-ypserv.init $RPM_BUILD_ROOT%{initdir}/ypserv
-install -m755 $RPM_SOURCE_DIR/ypserv-yppasswdd.init $RPM_BUILD_ROOT%{initdir}/yppasswdd
-install -m755 $RPM_SOURCE_DIR/ypserv-ypxfrd.init $RPM_BUILD_ROOT%{initdir}/ypxfrd
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{initdir}/ypserv
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{initdir}/yppasswdd
+install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{initdir}/ypxfrd
 
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cat >$RPM_BUILD_ROOT/etc/sysconfig/yppasswdd <<EOF
@@ -144,6 +150,10 @@ exit 0
 %{_includedir}/*/*
 
 %changelog
+* Thu Jan  7 2010 Karel Klic <kklic at redhat.com> - 2.19-15
+- Removed Prereq use in the spec file
+- Removed usage of RPM_SOURCE_DIR from the spec file
+
 * Tue Jan  5 2009 Karel Klic <kklic at redhat.com> - 2.19-14
 - Removed --enable-yppasswd from configure, as this option is
   ignored.