rpms/ipvsadm/devel ipvsadm-1.25-popt.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ipvsadm.spec, 1.16, 1.17 sources, 1.7, 1.8 ipvsadm-1.24-kernhdr-1.2.1.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/ipvsadm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3799

Modified Files:
	.cvsignore ipvsadm.spec sources 
Added Files:
	ipvsadm-1.25-popt.patch 
Removed Files:
	ipvsadm-1.24-kernhdr-1.2.1.patch 
Log Message:
Update to 1.25.


ipvsadm-1.25-popt.patch:

--- NEW FILE ipvsadm-1.25-popt.patch ---
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))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipvsadm/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 06:21:39 -0000	1.4
+++ .cvsignore	22 Dec 2008 19:08:04 -0000	1.5
@@ -1 +1 @@
-ipvsadm-1.24.tar.gz
+ipvsadm-1.25.tar.gz


Index: ipvsadm.spec
===================================================================
RCS file: /cvs/extras/rpms/ipvsadm/devel/ipvsadm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ipvsadm.spec	20 Feb 2008 04:16:46 -0000	1.16
+++ ipvsadm.spec	22 Dec 2008 19:08:04 -0000	1.17
@@ -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 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at 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 at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.24-10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipvsadm/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Oct 2007 12:03:27 -0000	1.7
+++ sources	22 Dec 2008 19:08:04 -0000	1.8
@@ -1 +1 @@
-fb99dce274d2e0c7c3df244388289677  ipvsadm-1.24.tar.gz
+772a053f5fe888cd25784c5f55d31fc3  ipvsadm-1.25.tar.gz


--- ipvsadm-1.24-kernhdr-1.2.1.patch DELETED ---