rpms/ypserv/F-8 ypserv-2.19-slp-warning.patch, NONE, 1.1 ypserv.spec, 1.39, 1.40

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/ypserv/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7911

Modified Files:
	ypserv.spec 
Added Files:
	ypserv-2.19-slp-warning.patch 
Log Message:
Mark /var/yp/Makefile as %%config(noreplace), Comment slp part of ypserv.conf to avoid ypserv warnings, Spec file cleanup

ypserv-2.19-slp-warning.patch:

--- NEW FILE ypserv-2.19-slp-warning.patch ---
diff -up ypserv-2.19/etc/ypserv.conf_old ypserv-2.19/etc/ypserv.conf
--- ypserv-2.19/etc/ypserv.conf_old	2004-04-01 12:06:38.000000000 +0200
+++ ypserv-2.19/etc/ypserv.conf	2008-02-13 11:43:06.000000000 +0100
@@ -17,9 +17,9 @@ dns: no
 files: 30
 
 # Should we register ypserv with SLP ?
-slp: no
+# slp: no
 # After how many seconds we should re-register ypserv with SLP ?
-slp_timeout: 3600
+# slp_timeout: 3600
 
 # xfr requests are only allowed from ports < 1024
 xfr_check_port: yes


Index: ypserv.spec
===================================================================
RCS file: /cvs/extras/rpms/ypserv/F-8/ypserv.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ypserv.spec	4 Feb 2008 14:04:03 -0000	1.39
+++ ypserv.spec	13 Feb 2008 13:32:32 -0000	1.40
@@ -1,11 +1,11 @@
 %define initdir /etc/rc.d/init.d
 
-Summary: The NIS (Network Information Service) server.
+Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 8%{?dist}
-License: GPL
+Release: 9%{?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
@@ -24,9 +24,10 @@
 Patch9: ypserv-2.13-nonedomain.patch
 Patch10: ypserv-2.19-quieter.patch
 Patch11: ypserv-2.19-debuginfo.patch
+Patch12: ypserv-2.19-slp-warning.patch
 Obsoletes: yppasswd
 BuildRequires: gdbm-devel
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Network Information Service (NIS) is a system that provides
@@ -57,6 +58,7 @@
 %patch9 -p1 -b .nonedomain
 %patch10 -p1 -b .quieter
 %patch11 -p1 -b .debuginfo
+%patch12 -p1 -b .slp-warning
 
 %build
 cp etc/README etc/README.etc
@@ -134,6 +136,7 @@
 %config %{_sysconfdir}/ypserv.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/yppasswdd
 %config /var/yp/*
+%config(noreplace) /var/yp/Makefile
 %dir /var/yp
 %config %{initdir}/*
 %{_libdir}/yp
@@ -142,7 +145,16 @@
 %{_includedir}/*/*
 
 %changelog
+* Wed Feb 13 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-9
+- Mark /var/yp/Makefile as %%config(noreplace)
+  Resolves: #432582
+- Comment "slp" part of ypserv.conf to avoid ypserv warnings
+  Resolves: #154806
+- Spec file cleanup - remove period from end of Summary,
+  fix license, remove macros from Changelog
+
 * Mon Feb  4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-8
+- Fix Buildroot
 - Fix /var/yp/Makefile
   Resolves: #431008
 
@@ -247,7 +259,7 @@
 * Mon Oct  7 2002 Alexander Larsson <alexl at redhat.com> 2.5-2
 - Added comments to nfsnobody patch
 - Corrected URL
-- fixed missing %doc file, bug #74060
+- fixed missing %%doc file, bug #74060
 
 * Thu Aug 15 2002 Alexander Larsson <alexl at redhat.com> 2.5-1
 - Update to 2.5, fixes memleak
@@ -372,7 +384,7 @@
 - add patch to avoid potential deadlock on the server (fix #9968)
 
 * Wed Feb  2 2000 Florian La Roche <Florian.LaRoche at redhat.com>
-- fix typo in %triggerpostun
+- fix typo in %%triggerpostun
 
 * Mon Oct 25 1999 Bill Nottingham <notting at redhat.com>
 - update to 1.3.9