- up to 1.25

Changed files:
    ipvsadm-make.patch -> 1.4
    ipvsadm.spec -> 1.22

diff --git a/ipvsadm-make.patch b/ipvsadm-make.patch
index 9288d7ed829fa8564bac9de74d8fcfb1d4eb0ba1..92b9a2443905fcb985b0100593d1d9a58221d33f 100644 (file)
--- a/ipvsadm-make.patch
+++ b/ipvsadm-make.patch
@@ -4,8 +4,8 @@
  ARCH          = $(shell uname -m)
  
  CC            = gcc
--INCLUDE               = -I/usr/src/linux/include -I.. -I.
-+INCLUDE               = -I.. -I.
+-INCLUDE               =
++INCLUDE               = 
  SBIN          = $(BUILD_ROOT)/sbin
  MANDIR                = usr/man
  MAN           = $(BUILD_ROOT)/$(MANDIR)/man8
@@ -13,10 +13,10 @@
  STATIC_LIBS   = libipvs/libipvs.a
  
  ifeq "${ARCH}" "sparc64"
--    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -O2 -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
+-    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
 +    CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
  else
--    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -O2
+-    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g
 +    CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes
  endif
  
@@ -29,7 +29,7 @@
 -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 "-L$$i -lpopt"; \
+-      echo "-lpopt"; \
 -    fi; \
 -  fi; \
 -done)
@@ -57,14 +57,15 @@
                [ -d $(MAN) ] || $(MKDIR) -p $(MAN)
 --- 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,12 +1,12 @@
+@@ -1,14 +1,14 @@
  # Makefile for libipvs
  
  CC            = gcc
--INCLUDE               = -I/usr/src/linux/include
--CFLAGS                = -Wall -Wunused -Wstrict-prototypes -g -O2
-+INCLUDE               =
-+CFLAGS                = $(OPT) -Wall -Wunused -Wstrict-prototypes
+-CFLAGS                = -Wall -Wunused -Wstrict-prototypes -g -fPIC
++CFLAGS                = $(OPT) -Wall -Wunused -Wstrict-prototypes -fPIC
+ ifneq (0,$(HAVE_NL))
+ CFLAGS                += -DLIBIPVS_USE_NL
+ endif
  
 -INCLUDE               += $(shell if [ -f ../../ip_vs.h ]; then        \
 -                   echo "-I../../."; fi;)

diff --git a/ipvsadm.spec b/ipvsadm.spec
index 1db8dfc09d0ba94b970c9c2da6b94f0db641763a..90daeac5554ec0fff79b59e118156b623e649bd4 100644 (file)
--- a/ipvsadm.spec
+++ b/ipvsadm.spec
@@ -1,15 +1,16 @@
 Summary:       Utility to administer the Linux Virtual Server
 Summary(pl.UTF-8):     Narzędzie do administracji wirtualnymi serwerami
 Name:          ipvsadm
-Version:       1.24
+Version:       1.25
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.linuxvirtualserver.org/software/kernel-2.6/%{name}-%{version}.tar.gz
-# Source0-md5: a9378adf5af7a799535b4c26cf3bcf10
+# Source0-md5: 772a053f5fe888cd25784c5f55d31fc3
 Source1:       %{name}-ip_vs.h
 Patch0:                %{name}-make.patch
 URL:           http://www.LinuxVirtualServer.org/
+BuildRequires: libnl-devel
 BuildRequires: popt-devel
 Conflicts:     ipvsadm24
 Conflicts:     piranha <= 0.4.14