rpms/west-chamber/F-13 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 west-chamber-manpage.patch, 1.1, 1.2 west-chamber-userspace.patch, 1.1, 1.2 west-chamber.spec, 1.2, 1.3

Thu Oct 28 09:41:36 CEST 2010

Author: supercyper

Update of /cvs/free/rpms/west-chamber/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9633

Modified Files:
	.cvsignore sources west-chamber-manpage.patch 
	west-chamber-userspace.patch west-chamber.spec 
Log Message:
Update to snapshot 20101017


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- .cvsignore	15 Apr 2010 12:15:15 -0000	1.4
+++ .cvsignore	28 Oct 2010 07:41:35 -0000	1.5
@@ -1 +1 @@
-west-chamber-20100405.tar.bz2
+west-chamber-20101017.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Apr 2010 12:15:15 -0000	1.4
+++ sources	28 Oct 2010 07:41:35 -0000	1.5
@@ -1 +1 @@
-38d1503a1df5d8b5fa6823e3e0ed4982  west-chamber-20100405.tar.bz2
+fa4543064bbcde2d3b287a3a068b2e57  west-chamber-20101017.tar.bz2

west-chamber-manpage.patch:
 xtables-addons.8.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: west-chamber-manpage.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/west-chamber-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-manpage.patch	15 Apr 2010 06:45:28 -0000	1.1
+++ west-chamber-manpage.patch	28 Oct 2010 07:41:35 -0000	1.2
@@ -1,7 +1,7 @@
 --- west-chamber-20100329/xtables-addons.8.in	2010-02-17 03:17:37.488265000 +0800
 +++ west-chamber-0.0.1/xtables-addons.8.in	2010-03-29 13:55:48.376922724 +0800
 @@ -1,6 +1,6 @@
--.TH xtables-addons 8 "v1.22 (2010-01-22)" "" "v1.22 (2010-11-22)"
+-.TH xtables-addons 8 "v1.30 (2010-10-02)" "" "v1.30 (2010-10-02)"
 +.TH west-chamber 8 "v0.0.1 (2010-03-10)" "" "v0.0.1 (2010-03-10)"
  .SH Name
 -Xtables-addons \(em additional extensions for iptables, ip6tables, etc.

west-chamber-userspace.patch:
 Makefile.am            |    1 -
 configure.ac           |   46 ----------------------------------------------
 extensions/Makefile.am |   22 ----------------------
 3 files changed, 69 deletions(-)

Index: west-chamber-userspace.patch
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/west-chamber-userspace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- west-chamber-userspace.patch	15 Apr 2010 06:45:28 -0000	1.1
+++ west-chamber-userspace.patch	28 Oct 2010 07:41:35 -0000	1.2
@@ -1,6 +1,7 @@
---- west-chamber-0.0.1/configure.ac.org	2010-03-10 17:29:33.000000000 +0800
-+++ west-chamber-0.0.1/configure.ac	2010-03-25 17:26:14.318739496 +0800
-@@ -9,19 +9,6 @@
+diff -Naur xtables-addons-1.30.orig/configure.ac xtables-addons-1.30/configure.ac
+--- xtables-addons-1.30.orig/configure.ac	2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/configure.ac	2010-10-27 17:54:14.962186249 +0800
+@@ -9,18 +9,6 @@
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
  
@@ -16,21 +17,12 @@
 -	kbuilddir="";
 -fi
 -
--AC_ARG_WITH([ksource],,[ksourcedir="$withval"])
- AC_ARG_WITH([xtables],
- 	AS_HELP_STRING([--with-xtables=PATH],
- 	[Path to the Xtables includes [[none]]]),
-@@ -64,52 +51,9 @@
- 	-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \
- 	-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
- 	-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\"";
--kinclude_CFLAGS="";
--if [[ -n "$kbuilddir" ]]; then
--	kinclude_CFLAGS="$kinclude_CFLAGS -I $kbuilddir/include";
--fi;
--if [[ -n "$ksourcedir" ]]; then
--	kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
--fi;
+ AC_ARG_WITH([xtlibdir],
+ 	AS_HELP_STRING([--with-xtlibdir=PATH],
+ 	[Path where to install Xtables extensions [[LIBEXECDIR/xtables]]]),
+@@ -37,42 +25,8 @@
+ 	-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+ 	-I\${XA_TOPSRCDIR}/include";
  
 -#
 -# check kernel version
@@ -57,7 +49,7 @@
 -	fi;
 -fi;
 -echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 32; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then
 -	echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
 -elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \
 -    \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \
@@ -67,25 +59,14 @@
 -fi;
  
  AC_SUBST([regular_CFLAGS])
--AC_SUBST([kinclude_CFLAGS])
 -AC_SUBST([kbuilddir])
--AC_SUBST([ksourcedir])
  AC_SUBST([xtlibdir])
- AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
+ AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans 
  	extensions/Makefile extensions/ipset/Makefile])
---- _kmod_build_2.6.32.9-70.fc12.i686/Makefile.am	2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/Makefile.am	2010-03-18 15:42:33.261210915 +0800
-@@ -12,7 +12,6 @@
- 	${MAKE} -f Makefile.mans all;
- 
- install-exec-hook:
--	depmod -a || :;
- 
- config.status: Makefile.iptrules.in
-
---- _kmod_build_2.6.32.9-70.fc12.i686/extensions/Makefile.am	2010-03-17 09:50:23.000000000 +0800
-+++ xtables-addons-1.24/extensions/Makefile.am	2010-03-18 15:39:05.484210946 +0800
-@@ -1,24 +1,5 @@
+diff -Naur xtables-addons-1.30.orig/extensions/Makefile.am xtables-addons-1.30/extensions/Makefile.am
+--- xtables-addons-1.30.orig/extensions/Makefile.am	2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/extensions/Makefile.am	2010-10-27 17:54:53.010183177 +0800
+@@ -1,26 +1,4 @@
  # -*- Makefile -*-
  # AUTOMAKE
  
@@ -95,6 +76,8 @@
 -_kcall = -C ${kbuilddir} M=${abs_srcdir}
 -
 -modules:
+-	@echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
+-	@if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
 -	${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
 -
 -modules_install:
@@ -108,5 +91,16 @@
 -install-exec-local: modules_install
 -
 -clean-local: clean_modules
- 
+-
  include ../Makefile.extra
+diff -Naur xtables-addons-1.30.orig/Makefile.am xtables-addons-1.30/Makefile.am
+--- xtables-addons-1.30.orig/Makefile.am	2010-10-02 06:41:47.000000000 +0800
++++ xtables-addons-1.30/Makefile.am	2010-10-27 17:55:29.350434539 +0800
+@@ -12,7 +12,6 @@
+ 	${MAKE} -f Makefile.mans all;
+ 
+ install-exec-hook:
+-	depmod -a || :;
+ 
+ config.status: Makefile.iptrules.in
+ 


Index: west-chamber.spec
===================================================================
RCS file: /cvs/free/rpms/west-chamber/F-13/west-chamber.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- west-chamber.spec	15 Apr 2010 06:45:28 -0000	1.2
+++ west-chamber.spec	28 Oct 2010 07:41:35 -0000	1.3
@@ -1,11 +1,10 @@
-%define svndate 20100405
-%define svnver 84
-
+%define svndate 20101017
+%define svnver 105
 
 Name:		west-chamber
 Summary:	Extensions named after Romance of the West Chamber for iptables
 Version:	0.0.1
-Release:	3.%{?svndate}svn%{?dist}
+Release:	6.%{?svndate}svn%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://code.google.com/p/scholarzhang/
@@ -14,13 +13,12 @@
 # following commands to generate the tarball:
 #  svn export -r %{svnver}  http://scholarzhang.googlecode.com/svn/trunk/west-chamber west-chamber-%{svndate}
 #  tar -cjvf west-chamber-%{svndate}.tar.bz2 west-chamber-%{svndate}
-Source0:	http://scholarzhang.googlecode.com/files/%{name}-%{svndate}.tar.bz2
+Source0:	%{name}-%{svndate}.tar.bz2
 Patch0:		%{name}-userspace.patch
 Patch1:		%{name}-manpage.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	iptables-devel
 BuildRequires:	autoconf automake libtool
-Requires:	xtables-addons
+Requires:	xtables-addons >= 1.30
 Provides:	%{name}-kmod-common = %{version}
 Requires:	%{name}-kmod >= %{version}
 
@@ -36,6 +34,10 @@
 %setup -q -n west-chamber-%{svndate}
 %patch0 -p1
 %patch1 -p1
+
+# remove bundled files from xtables-addons
+rm -rf include extensions/compat* 
+
 #do not build bundled xtables-addons modules
 sed -i '/build_ipset=m/d' mconfig
 
@@ -46,7 +48,6 @@
 
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 mv %{buildroot}%{_mandir}/man8/xtables-addons.8 %{buildroot}%{_mandir}/man8/%{name}.8
 
@@ -60,6 +61,9 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Oct 28 2010 Chen Lei <supercyper at 163.com> - 0.0.1-6.20101017svn
+- svn 105
+
 * Mon Apr 05 2010 Caius 'kaio' Chance <kaio at fedoraproject.org> - 0.0.1-3.20100405svn
 - svn 84
 

