rpms/xtables-addons/devel sources, 1.15, 1.16 .cvsignore, 1.14, 1.15 xtables-addons.spec, 1.21, 1.22

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/xtables-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5318

Modified Files:
	sources .cvsignore xtables-addons.spec 
Log Message:
Update to 2.6



Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	26 Apr 2014 15:00:51 -0000	1.15
+++ sources	4 Nov 2014 21:28:04 -0000	1.16
@@ -1 +1 @@
-335663ece5fb17c7d0bb24dbdc697eb1  xtables-addons-2.5.tar.xz
+087835ba7e564481b6fd398692268340  xtables-addons-2.6.tar.xz


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	26 Apr 2014 15:00:51 -0000	1.14
+++ .cvsignore	4 Nov 2014 21:28:04 -0000	1.15
@@ -1 +1 @@
-xtables-addons-2.5.tar.xz
+xtables-addons-2.6.tar.xz


Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/xtables-addons.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xtables-addons.spec	26 Apr 2014 15:00:51 -0000	1.21
+++ xtables-addons.spec	4 Nov 2014 21:28:04 -0000	1.22
@@ -1,23 +1,16 @@
 Name:		xtables-addons
 Summary:	Extensions targets and matches for iptables
-Version:	2.5
+Version:	2.6
 Release:	1%{?dist}
 # The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
 License:	GPLv2 and LGPLv2
 Group:		System Environment/Base
 URL:		http://xtables-addons.sourceforge.net
 Source0:	http://dl.sourceforge.net/xtables-addons/Xtables-addons/%{version}/xtables-addons-%{version}.tar.xz
-Source1:	ipset.init
-Source2:	ipset-config
 BuildRequires:	iptables-devel >= 1.4.5
 BuildRequires:	autoconf automake libtool
 Provides:	%{name}-kmod-common = %{version}
 Requires:	%{name}-kmod >= %{version}
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
 Requires:	ipset >= 6.11
 Obsoletes:	%{name}-devel < 1.27-1
 
@@ -57,40 +50,20 @@
 # There is no -devel package. So no need for these files
 rm -f %{buildroot}%{_libdir}/*.{la,so}
 
-# install init scripts and configuration files
-install -D -pm 0755 %{SOURCE1} %{buildroot}%{_initddir}/ipset
-install -D -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ipset-config
-
-%post 
-/sbin/ldconfig
-/sbin/chkconfig --add ipset
-
-%preun
-if [ $1 = 0 ] ; then
-    /sbin/service ipset stop >/dev/null 2>&1
-    /sbin/chkconfig --del ipset
-fi
-
-%postun
-/sbin/ldconfig
-if [ "$1" -ge "1" ] ; then
-    /sbin/service ipset condrestart >/dev/null 2>&1 || :
-fi
-
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE README doc/* geoip
-%attr(0755,root,root) %{_initddir}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
 %{_libdir}/xtables/*.so
 %{_libdir}/*.so.*
 %{_sbindir}/iptaccount
 %{_mandir}/man?/*
 
 %changelog
+* Tue Nov 04 2014 Nicolas Chauvet <kwizart at gmail.com> - 2.6-1
+- Update to 2.6
+- Drop initscript (use ipset-services instead)
+- Spec file clean-up
+
 * Sat Apr 26 2014 Nicolas Chauvet <kwizart at gmail.com> - 2.5-1
 - Update to 2.5