Update to 1.25.

.cvsignore

@@ -1 +1 @@
-ipvsadm-1.24.tar.gz
+ipvsadm-1.25.tar.gz

ipvsadm-1.25-popt.patch

@@ -0,0 +1,19 @@
+diff -Naupr ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
+--- ipvsadm-1.25.orig/Makefile	2008-09-23 18:14:46.000000000 +0200
++++ ipvsadm-1.25/Makefile	2008-12-22 20:03:53.793372130 +0100
+@@ -62,14 +62,7 @@ RPMBUILD = $(shell				\
+ 	fi )
+ 
+ ifeq (,$(FORCE_GETOPT))
+-LIB_SEARCH = /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"; \
+-    fi; \
+-  fi; \
+-done)
++POPT_LIB = "-lpopt"
+ endif
+ 
+ ifneq (,$(POPT_LIB))

ipvsadm.spec

@@ -1,15 +1,16 @@
 Summary: Utility to administer the Linux Virtual Server
 Name: ipvsadm
-Version: 1.24
-Release: 11
+Version: 1.25
+Release: 1
 License: GPLv2+
 Group: Applications/System
 URL: http://www.linuxvirtualserver.org/software/ipvs.html
 Source: http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-%{version}.tar.gz
-Patch0: ipvsadm-1.24-kernhdr-1.2.1.patch
-Patch1: ipvsadm-1.24-Makefile.patch
+Patch0: ipvsadm-1.24-Makefile.patch
+Patch1: ipvsadm-1.25-popt.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: kernel-headers
+Buildrequires: libnl-devel
+Buildrequires: popt-devel
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 
@@ -61,7 +62,11 @@ fi
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.24-11
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.25-1
+- Prepare update to 1.25 for when devel will update to kernel 2.6.28.
+- Build require libnl-devel and popt-devel (+ patch to fix popt detection).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.24-10

sources

@@ -1 +1 @@
-fb99dce274d2e0c7c3df244388289677  ipvsadm-1.24.tar.gz
+772a053f5fe888cd25784c5f55d31fc3  ipvsadm-1.25.tar.gz