From 301b438db1a69ed264b6c4494d4f8b8133a0eae5 Mon Sep 17 00:00:00 2001
From: Karel Klic <kklic@redhat.com>
Date: Tue, 23 Nov 2010 14:42:16 +0100
Subject: [PATCH] Reverted previous change

---
 yp-tools-2.12-noypclnt.patch | 11 -----------
 yp-tools.spec                | 11 ++++-------
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 yp-tools-2.12-noypclnt.patch

diff --git a/yp-tools-2.12-noypclnt.patch b/yp-tools-2.12-noypclnt.patch
deleted file mode 100644
index 77fa1d3..0000000
--- a/yp-tools-2.12-noypclnt.patch
+++ /dev/null
@@ -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
diff --git a/yp-tools.spec b/yp-tools.spec
index 6c6c51e..403a41f 100644
--- a/yp-tools.spec
+++ b/yp-tools.spec
@@ -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)