Reverted previous change

This commit is contained in:
Karel Klic 2010-11-23 14:42:16 +01:00
parent ec87306b29
commit 301b438db1
2 changed files with 4 additions and 18 deletions

View File

@ -1,11 +0,0 @@
diff -up yp-tools-2.12/src/Makefile.am.noypclnt yp-tools-2.12/src/Makefile.am
--- yp-tools-2.12/src/Makefile.am.noypclnt 2010-11-23 13:32:54.328891585 +0100
+++ yp-tools-2.12/src/Makefile.am 2010-11-23 13:33:02.167767691 +0100
@@ -21,7 +21,6 @@ yppasswd_SOURCES = yppasswd.c yppasswd_x
yppasswd_LDADD = ${LDADD} @LIBCRYPT@ @LIBCRACK@
yppasswd_CFLAGS = -DPASSWD_PROG=\"${PASSWD_PROG}\" \
-DCHFN_PROG=\"${CHFN_PROG}\" -DCHSH_PROG=\"${CHSH_PROG}\"
-ypmatch_SOURCES = ypmatch.c ypclnt.c
install-exec-hook:
ln -f ${DESTDIR}${bindir}/yppasswd ${DESTDIR}${bindir}/ypchsh

View File

@ -1,18 +1,14 @@
Summary: NIS (or YP) client programs
Name: yp-tools
Version: 2.12
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2
Group: System Environment/Base
Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
# Not sent to upstream
Patch0: yp-tools-2.11-shadow.patch
# Not sent to upstream
Patch1: yp-tools-2.12-noypclnt.patch
Url: http://www.linux-nis.org/nis/yp-tools/index.html
Requires: ypbind
# We need autoreconf for Patch1.
BuildRequires: autoconf, automake
%description
The Network Information Service (NIS) is a system which provides
@ -37,10 +33,8 @@ you'll need to install the ypserv package on one machine on the network.
%prep
%setup -q
%patch0 -p1 -b .shadow
%patch1 -p1 -b .noypclnt
%build
autoreconf
%configure --disable-domainname
make
@ -60,6 +54,9 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_PROGRAM=install install
/var/yp/nicknames
%changelog
* Tue Nov 23 2010 Karel Klic <kklic@redhat.com> - 2.12-3
- Reverted previous change
* Tue Nov 23 2010 Karel Klic <kklic@redhat.com> - 2.12-2
- Added patch that removes ypclnt.c from being compiled into
ypmatch (rhbz#546149)