From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Fri, 26 Aug 2011 11:19:49 +0000 (+0000)
Subject: - up to 1.38
X-Git-Tag: auto/th/xtables-addons-1_38-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=commitdiff_plain;h=0553edd5f2a4089f85e5d1851d148079289f528b

- up to 1.38

Changed files:
    xtables-addons-build.patch -> 1.1
    xtables-addons.spec -> 1.116
---

diff --git a/xtables-addons-build.patch b/xtables-addons-build.patch
new file mode 100644
index 0000000..596dc5c
--- /dev/null
+++ b/xtables-addons-build.patch
@@ -0,0 +1,17 @@
+--- xtables-addons-1.38/extensions/ipset-6/Makefile.am~	2011-08-20 17:02:31.000000000 +0200
++++ xtables-addons-1.38/extensions/ipset-6/Makefile.am	2011-08-26 13:15:36.983190997 +0200
+@@ -8,12 +8,12 @@
+ lib_LTLIBRARIES = libipset.la
+ libipset_la_SOURCES = libipset/data.c libipset/icmp.c libipset/icmpv6.c \
+                       libipset/mnl.c libipset/parse.c libipset/print.c \
+-                      libipset/session.c libipset/types.c
++                      libipset/session.c libipset/types.c src/errcode.c
+ libipset_la_LIBADD  = ${libmnl_LIBS}
+ libipset_la_LDFLAGS = -version-info 1:0:0
+ 
+ sbin_PROGRAMS = ipset
+-ipset_SOURCES = src/ipset.c src/errcode.c src/ui.c src/ipset_bitmap_ip.c \
++ipset_SOURCES = src/ipset.c src/ui.c src/ipset_bitmap_ip.c \
+                 src/ipset_bitmap_ipmac.c src/ipset_bitmap_port.c \
+                 src/ipset_hash_ip.c src/ipset_hash_ipport.c \
+                 src/ipset_hash_ipportip.c src/ipset_hash_ipportnet.c \
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 742d2ab..46c8e0d 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -19,12 +19,13 @@
 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.37
+Version:	1.38
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	bfb0adba948fa885fffa6443eeaee28a
+# Source0-md5:	6a69e9931e2392348c8674af1f2fc056
+Patch0:		%{name}-build.patch
 URL:		http://xtables-addons.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.11
@@ -36,6 +37,7 @@ BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 Requires:	iptables >= 1.4.3
+Obsoletes:	ipset
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
@@ -77,6 +79,7 @@ Moduły jądra dla rozszerzeń z pakietu xtables-addons.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -i -e 's#build_ipset4=m#build_ipset4=#' mconfig
 
@@ -146,10 +149,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README doc/{README.psd,changelog.txt}
+%attr(755,root,root) %{_sbindir}/ipset
 %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
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
+%attr(755,root,root) %{_libdir}/libipset.so.*
+%{_mandir}/man8/ipset.8*
 %{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
 %endif