fix buildroot, fix /var/yp/Makefile

This commit is contained in:
vcrhonek 2008-02-04 14:44:27 +00:00
parent ea77cbb5c4
commit 71aa6aa487
2 changed files with 17 additions and 11 deletions

View File

@ -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 15:26:47.000000000 +0100
+++ ypserv-2.19/scripts/ypMakefile.in 2008-02-04 15:27:12.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

View File

@ -4,7 +4,7 @@ Summary: The NIS (Network Information Service) server.
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
@ -26,7 +26,7 @@ Patch10: ypserv-2.19-quieter.patch
Patch11: ypserv-2.19-debuginfo.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
@ -54,9 +54,9 @@ machines.
%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,11 @@ exit 0
%{_includedir}/*/*
%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.