rpms/ypserv/F-8 ypserv-2.13-nonedomain.patch, 1.1, 1.2 ypserv.spec, 1.38, 1.39
Vitezslav Crhonek (vcrhonek)
fedora-extras-commits at redhat.com
Mon Feb 4 14:04:09 UTC 2008
Author: vcrhonek
Update of /cvs/extras/rpms/ypserv/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16204
Modified Files:
ypserv-2.13-nonedomain.patch ypserv.spec
Log Message:
fix /var/yp/Makefile
ypserv-2.13-nonedomain.patch:
Index: ypserv-2.13-nonedomain.patch
===================================================================
RCS file: /cvs/extras/rpms/ypserv/F-8/ypserv-2.13-nonedomain.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ypserv-2.13-nonedomain.patch 22 Dec 2006 17:17:37 -0000 1.1
+++ ypserv-2.13-nonedomain.patch 4 Feb 2008 14:04:03 -0000 1.2
@@ -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
Index: ypserv.spec
===================================================================
RCS file: /cvs/extras/rpms/ypserv/F-8/ypserv.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ypserv.spec 8 Jan 2008 19:21:41 -0000 1.38
+++ ypserv.spec 4 Feb 2008 14:04:03 -0000 1.39
@@ -4,7 +4,7 @@
Url: http://www.linux-nis.org/nis/ypserv/index.html
Name: ypserv
Version: 2.19
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPL
Group: System Environment/Daemons
Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -54,9 +54,9 @@
%patch6 -p1 -b .memleak
%patch7 -p1 -b .respzero
%patch8 -p1 -b .ports
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
+%patch9 -p1 -b .nonedomain
+%patch10 -p1 -b .quieter
+%patch11 -p1 -b .debuginfo
%build
cp etc/README etc/README.etc
@@ -142,6 +142,10 @@
%{_includedir}/*/*
%changelog
+* Mon Feb 4 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.19-8
+- Fix /var/yp/Makefile
+ Resolves: #431008
+
* Tue Jan 8 2008 Steve Dickson <steved at redhat.com> 2.19-7
- Changed Makefiles.in so binaries are not stripped.
More information about the fedora-extras-commits
mailing list