packages: ipvsadm/ipvsadm-make.patch, ipvsadm/ipvsadm.spec, ipvsadm/ipvsadm...

[qboosh]

Author: qboosh                       Date: Fri Mar 18 15:32:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped 6-year old ip_vs.h file; internal libipvs contains more recent version

---- Files affected:
packages/ipvsadm:
   ipvsadm-make.patch (1.5 -> 1.6) , ipvsadm.spec (1.26 -> 1.27) , ipvsadm-ip_vs.h (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ipvsadm/ipvsadm-make.patch
diff -u packages/ipvsadm/ipvsadm-make.patch:1.5 packages/ipvsadm/ipvsadm-make.patch:1.6
--- packages/ipvsadm/ipvsadm-make.patch:1.5	Fri Mar 18 13:45:56 2011
+++ packages/ipvsadm/ipvsadm-make.patch	Fri Mar 18 16:32:46 2011
@@ -1,5 +1,5 @@
---- ipvsadm-1.24/Makefile.orig	2004-10-27 17:53:07.000000000 +0200
-+++ ipvsadm-1.24/Makefile	2005-06-06 21:23:52.864458968 +0200
+--- ipvsadm-1.26/Makefile.orig	2004-10-27 17:53:07.000000000 +0200
++++ ipvsadm-1.26/Makefile	2005-06-06 21:23:52.864458968 +0200
 @@ -33,7 +33,7 @@
  ARCH		= $(shell uname -m)
  
@@ -38,18 +38,17 @@
  endif
  
  ifneq (,$(POPT_LIB))
-@@ -78,7 +71,7 @@
+@@ -78,7 +71,5 @@
  LIBS		= $(POPT_LIB)
  DEFINES		= -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \
 		  -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE)
 -DEFINES		+= $(shell if [ ! -f ../ip_vs.h ]; then	\
-+DEFINES		+= $(shell if [ ! -f ip_vs.h ]; then	\
- 		     echo "-DHAVE_NET_IP_VS_H"; fi;)
+-		     echo "-DHAVE_NET_IP_VS_H"; fi;)
  
  
 --- ipvsadm-1.24/libipvs/Makefile.orig	2002-12-19 14:53:07.000000000 +0100
 +++ ipvsadm-1.24/libipvs/Makefile	2005-06-06 21:25:13.995125232 +0200
-@@ -1,14 +1,14 @@
+@@ -1,14 +1,10 @@
  # Makefile for libipvs
  
  CC		= gcc
@@ -62,9 +61,6 @@
 -INCLUDE		+= $(shell if [ -f ../../ip_vs.h ]; then	\
 -		     echo "-I../../."; fi;)
 -DEFINES		= $(shell if [ ! -f ../../ip_vs.h ]; then	\
-+INCLUDE		+= $(shell if [ -f ../ip_vs.h ]; then	\
-+		     echo "-I.."; fi;)
-+DEFINES		= $(shell if [ ! -f ../ip_vs.h ]; then	\
- 		    echo "-DHAVE_NET_IP_VS_H"; fi;)
+-		    echo "-DHAVE_NET_IP_VS_H"; fi;)
  
  .PHONY		= all clean install dist distclean rpm rpms

================================================================
Index: packages/ipvsadm/ipvsadm.spec
diff -u packages/ipvsadm/ipvsadm.spec:1.26 packages/ipvsadm/ipvsadm.spec:1.27
--- packages/ipvsadm/ipvsadm.spec:1.26	Fri Mar 18 13:45:56 2011
+++ packages/ipvsadm/ipvsadm.spec	Fri Mar 18 16:32:46 2011
@@ -4,11 +4,10 @@
 Name:		ipvsadm
 Version:	1.26
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		Applications/System
 Source0:	http://www.linuxvirtualserver.org/software/kernel-2.6/%{name}-%{version}.tar.gz
 # Source0-md5:	eac3ba3f62cd4dea2da353aeddd353a8
-Source1:	%{name}-ip_vs.h
 Patch0:		%{name}-make.patch
 URL:		http://www.LinuxVirtualServer.org/
 BuildRequires:	libnl-devel
@@ -36,8 +35,6 @@
 %setup -q
 %patch0 -p1
 
-cp -f %{SOURCE1} ip_vs.h
-
 %build
 %{__make} -j1 \
 	CC="%{__cc}" \
@@ -70,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2011/03/18 15:32:46  qboosh
+- dropped 6-year old ip_vs.h file; internal libipvs contains more recent version
+
 Revision 1.26  2011/03/18 12:45:56  zbyniu
 - up to 1.26
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipvsadm/ipvsadm-make.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipvsadm/ipvsadm.spec?r1=1.26&r2=1.27&f=u