dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ypserv
-# $Id: Makefile,v 1.1 2004/09/09 15:12:58 cvsdist Exp $
-NAME := ypserv
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ypserv-2.13-nonedomain.patch

@@ -1,20 +1,21 @@
---- ypserv-2.13/scripts/ypMakefile.in.nonedomain	2006-10-13 17:27:48.000000000 -0500
-+++ ypserv-2.13/scripts/ypMakefile.in	2006-10-13 17:36:22.000000000 -0500
+diff -up ypserv-2.19/scripts/ypMakefile.in_old ypserv-2.19/scripts/ypMakefile.in
+--- ypserv-2.19/scripts/ypMakefile.in_old	2008-02-04 14:47:49.000000000 +0100
++++ ypserv-2.19/scripts/ypMakefile.in	2008-02-04 14:48:21.000000000 +0100
 @@ -98,10 +98,18 @@ NETMASKS    = $(YPSRCDIR)/netmasks
  YPSERVERS = $(YPDIR)/ypservers	# List of all NIS servers for a domain
  
  target: Makefile
-+ifeq    ($(shell /bin/domainname), (none))
++ifeq ($(shell /bin/domainname), (none))
 +	@echo "Domain name cannot be (none)"
 +else
-+  ifeq ($(shell /bin/domainname), )
++ifeq ($(shell /bin/domainname), )
 +	@echo "Domain name must be set"
-+	else
++else
  	@test ! -d $(LOCALDOMAIN) && mkdir $(LOCALDOMAIN) ; \
  	cd $(LOCALDOMAIN)  ; \
  	$(NOPUSH) || $(MAKE) -f ../Makefile ypservers; \
  	$(MAKE) -f ../Makefile all
-+  endif
++endif
 +endif
  
  # If you don't want some of these maps built, feel free to comment

ypserv-2.19-debuginfo.patch

@@ -0,0 +1,96 @@
+diff -up ypserv-2.19/revnetgroup/Makefile.in.orig ypserv-2.19/revnetgroup/Makefile.in
+--- ypserv-2.19/revnetgroup/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
++++ ypserv-2.19/revnetgroup/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/rpc.yppasswdd/Makefile.in.orig ypserv-2.19/rpc.yppasswdd/Makefile.in
+--- ypserv-2.19/rpc.yppasswdd/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
++++ ypserv-2.19/rpc.yppasswdd/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -103,7 +103,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/yppush/Makefile.in.orig ypserv-2.19/yppush/Makefile.in
+--- ypserv-2.19/yppush/Makefile.in.orig	2006-01-10 14:22:32.000000000 -0500
++++ ypserv-2.19/yppush/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -96,7 +96,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/ypserv/Makefile.in.orig ypserv-2.19/ypserv/Makefile.in
+--- ypserv-2.19/ypserv/Makefile.in.orig	2006-01-10 14:22:32.000000000 -0500
++++ ypserv-2.19/ypserv/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/rpc.ypxfrd/Makefile.in.orig ypserv-2.19/rpc.ypxfrd/Makefile.in
+--- ypserv-2.19/rpc.ypxfrd/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
++++ ypserv-2.19/rpc.ypxfrd/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -98,7 +98,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/makedbm/Makefile.in.orig ypserv-2.19/makedbm/Makefile.in
+--- ypserv-2.19/makedbm/Makefile.in.orig	2006-01-10 14:22:30.000000000 -0500
++++ ypserv-2.19/makedbm/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -96,7 +96,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/mknetid/Makefile.in.orig ypserv-2.19/mknetid/Makefile.in
+--- ypserv-2.19/mknetid/Makefile.in.orig	2006-01-10 14:22:31.000000000 -0500
++++ ypserv-2.19/mknetid/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -97,7 +97,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+diff -up ypserv-2.19/yphelper/Makefile.in.orig ypserv-2.19/yphelper/Makefile.in
+--- ypserv-2.19/yphelper/Makefile.in.orig	2006-01-10 14:22:32.000000000 -0500
++++ ypserv-2.19/yphelper/Makefile.in	2008-01-08 11:07:22.000000000 -0500
+@@ -95,7 +95,7 @@ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ INSTALL_DATA = @INSTALL_DATA@
+ #
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555
++INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 555
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@

ypserv-2.19-slp-warning.patch

@@ -0,0 +1,15 @@
+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

ypserv.spec

@@ -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: 6%{?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
@@ -23,9 +23,11 @@ Patch7: ypserv-2.13-ypxfr-zeroresp.patch
 Patch8: ypserv-2.19-inval-ports.patch
 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
@@ -53,6 +55,10 @@ machines.
 %patch6 -p1 -b .memleak
 %patch7 -p1 -b .respzero
 %patch8 -p1 -b .ports
+%patch9 -p1 -b .nonedomain
+%patch10 -p1 -b .quieter
+%patch11 -p1 -b .debuginfo
+%patch12 -p1 -b .slp-warning
 
 %build
 cp etc/README etc/README.etc
@@ -130,6 +136,7 @@ exit 0
 %config %{_sysconfdir}/ypserv.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/yppasswdd
 %config /var/yp/*
+%config(noreplace) /var/yp/Makefile
 %dir /var/yp
 %config %{initdir}/*
 %{_libdir}/yp
@@ -138,6 +145,22 @@ exit 0
 %{_includedir}/*/*
 
 %changelog
+* Wed Feb 13 2008 Vitezslav Crhonek <vcrhonek@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@redhat.com> - 2.19-8
+- Fix Buildroot
+- Fix /var/yp/Makefile
+  Resolves: #431008
+
+* Tue Jan  8 2008 Steve Dickson <steved@redhat.com> 2.19-7
+- Changed Makefiles.in so binaries are not stripped.
+
 * Sat Sep 15 2007 Steve Dickson <steved@redhat.com> 2.19-6
 - Fixed init scripts to return correct exit code on
  'service status' (bz 248097)
@@ -236,7 +259,7 @@ exit 0
 * Mon Oct  7 2002 Alexander Larsson <alexl@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@redhat.com> 2.5-1
 - Update to 2.5, fixes memleak
@@ -361,7 +384,7 @@ exit 0
 - add patch to avoid potential deadlock on the server (fix #9968)
 
 * Wed Feb  2 2000 Florian La Roche <Florian.LaRoche@redhat.com>
-- fix typo in %triggerpostun
+- fix typo in %%triggerpostun
 
 * Mon Oct 25 1999 Bill Nottingham <notting@redhat.com>
 - update to 1.3.9