[ipvsadm] Update to 1.26 (#676167).

[Matthias Saou]

commit 506db94ef8e7c87ac775bf26fbad02cd44fdee2d
Author: Matthias Saou <thias at marmotte.net>
Date:   Sat Jul 9 23:30:15 2011 +0200

    Update to 1.26 (#676167).

 .gitignore                     |    1 +
 ipvsadm-1.24-Makefile.patch    |   23 -----------------------
 ipvsadm-1.25-activeconns.patch |   12 ------------
 ipvsadm-1.25-popt.patch        |   19 -------------------
 ipvsadm-1.26-popt.patch        |   20 ++++++++++++++++++++
 ipvsadm.spec                   |   14 +++++++-------
 sources                        |    2 +-
 7 files changed, 29 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91a1d9a..f7c0a2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ipvsadm-1.25.tar.gz
+/ipvsadm-1.26.tar.gz
diff --git a/ipvsadm-1.26-popt.patch b/ipvsadm-1.26-popt.patch
new file mode 100644
index 0000000..5b7f9ea
--- /dev/null
+++ b/ipvsadm-1.26-popt.patch
@@ -0,0 +1,20 @@
+diff -Naupr ipvsadm-1.26.orig/Makefile ipvsadm-1.26/Makefile
+--- ipvsadm-1.26.orig/Makefile	2011-02-08 01:24:23.000000000 +0100
++++ ipvsadm-1.26/Makefile	2011-07-09 23:22:54.834017156 +0200
+@@ -63,15 +63,7 @@ RPMBUILD = $(shell				\
+ 	fi )
+ 
+ ifeq (,$(FORCE_GETOPT))
+-LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib
+-POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
+-  if [ -f $$i/libpopt.a ]; then \
+-    if nm $$i/libpopt.a | fgrep -q poptGetContext; then \
+-	echo "-lpopt"; \
+-	break; \
+-    fi; \
+-  fi; \
+-done)
++POPT_LIB = "-lpopt"
+ endif
+ 
+ ifneq (,$(POPT_LIB))
diff --git a/ipvsadm.spec b/ipvsadm.spec
index 308202f..ae2cc47 100644
--- a/ipvsadm.spec
+++ b/ipvsadm.spec
@@ -1,15 +1,13 @@
 Summary: Utility to administer the Linux Virtual Server
 Name: ipvsadm
-Version: 1.25
-Release: 6%{?dist}
+Version: 1.26
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.linuxvirtualserver.org/software/ipvs.html
 Source0: http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-%{version}.tar.gz
 Source1: ipvsadm.init
-Patch0: ipvsadm-1.24-Makefile.patch
-Patch1: ipvsadm-1.25-popt.patch
-Patch2: ipvsadm-1.25-activeconns.patch
+Patch0: ipvsadm-1.26-popt.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Buildrequires: libnl-devel
 Buildrequires: popt-devel
@@ -24,8 +22,6 @@ offered by the Linux kernel.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 
 %build
@@ -67,6 +63,10 @@ fi
 
 
 %changelog
+* Sat Jul  9 2011 Matthias Saou <http://freshrpms.net/> 1.26-1
+- Update to 1.26 (#676167).
+- Remove upstreamed Makefile and activeconns patchs, rebase popt patch.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 1cdbf81..07f5b20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-772a053f5fe888cd25784c5f55d31fc3  ipvsadm-1.25.tar.gz
+eac3ba3f62cd4dea2da353aeddd353a8  ipvsadm-1.26.tar.gz