- up to 1.32; only userspace build-tested

Changed files:
    kernelrelease.patch -> 1.7
    xtables-addons.spec -> 1.91

diff --git a/kernelrelease.patch b/kernelrelease.patch
index ec7206991b70d77d151eb25276b0185cd5d236e7..58dba3b936d1c6d10263164456b921718da213a4 100644 (file)
--- a/kernelrelease.patch
+++ b/kernelrelease.patch
@@ -1,8 +1,8 @@
---- xtables-addons-1.31/configure.ac~  2010-12-02 22:13:08.366366978 +0100
-+++ xtables-addons-1.31/configure.ac   2010-12-02 22:14:14.780561896 +0100
-@@ -39,47 +39,6 @@
-       -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-       -I\${XA_TOPSRCDIR}/include";
+--- xtables-addons-1.32/configure.ac.orig      2011-01-04 04:37:58.000000000 +0100
++++ xtables-addons-1.32/configure.ac   2011-02-07 20:26:34.200686361 +0100
+@@ -40,47 +40,6 @@
+       -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
+       -Winline -pipe";
  
 -#
 -# check kernel version
@@ -14,21 +14,21 @@
 -      echo "WARNING: This distribution's shipped kernel is not supported.";
 -fi;
 -AC_MSG_CHECKING([kernel version that we will build against])
--krel="$(make -sC ${kbuilddir} kernelrelease)";
--krel="${krel%%-*}";
--kmajor="${krel%%.*}";
--krel="${krel#*.}";
--kminor="${krel%%.*}";
--krel="${krel#*.}";
--kmicro="${krel%%.*}";
--if test "$kmicro" = "$krel"; then
--      kmicro="$(($kmicro+0))"; # Get rid of non numbers ("2.6.36+" -> "2.6.36")
--      kstable=0;
--else
--      kmicro="$(($kmicro+0))";
--      kstable="${krel#*.}";
--      kstable="$(($kstable+0))";
--fi;
+-krel="$(make -sC "$kbuilddir" M=. kernelrelease)";
+-kmajor="${krel%%[[^0-9]]*}";
+-kmajor="$(($kmajor+0))";
+-krel="${krel:${#kmajor}}";
+-krel="${krel#.}";
+-kminor="${krel%%[[^0-9]]*}";
+-kminor="$(($kminor+0))";
+-krel="${krel:${#kminor}}";
+-krel="${krel#.}";
+-kmicro="${krel%%[[^0-9]]*}";
+-kmicro="$(($kmicro+0))";
+-krel="${krel:${#kmicro}}";
+-krel="${krel#.}";
+-kstable="${krel%%[[^0-9]]*}";
+-kstable="$(($kstable+0))";
 -if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
 -      echo "WARNING: Version detection did not succeed. Continue at own luck.";
 -else
@@ -45,6 +45,6 @@
 -      fi;
 -fi;
 -
+ AC_SUBST([regular_CPPFLAGS])
  AC_SUBST([regular_CFLAGS])
  AC_SUBST([kbuilddir])
- AC_SUBST([xtlibdir])

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 3d1d19955b241ea7f1d0bbb77d7b6d2eaf0b9f4a..e841f0da8e1859784b050000c56778531184824c 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -15,16 +15,16 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     8
+%define                rel     1
 Summary:       Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):     Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
 Name:          xtables-addons
-Version:       1.31
+Version:       1.32
 Release:       %{rel}
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5: 97ac895a67df67c28def98763023d51b
+# Source0-md5: 978a04e3e532ef0414ae1dd6a405304d
 Patch0:                kernelrelease.patch
 URL:           http://xtables-addons.sourceforge.net/
 BuildRequires: autoconf >= 2.50
@@ -80,7 +80,7 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 %setup -q
 %patch0 -p1
 
-%{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
+%{__sed} -i -e 's#build_ipset4=m#build_ipset4=#' mconfig
 
 %build
 %{__libtoolize}
@@ -89,7 +89,7 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 %{__autoheader}
 %{__automake}
 %configure \
-       --with-kbuild=no
+       --without-kbuild
 
 %if %{with kernel}
 srcdir=${PWD:-$(pwd)}
@@ -147,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README doc/{README.psd,changelog.txt}
 %attr(755,root,root) %{_sbindir}/iptaccount
 %attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.0