rpms/xtables-addons-kmod/F-13 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xtables-addons-kmod.spec, 1.28, 1.29

Chen Lei supercyper at rpmfusion.org
Wed Oct 27 11:28:32 CEST 2010


Author: supercyper

Update of /cvs/free/rpms/xtables-addons-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15612

Modified Files:
	.cvsignore sources xtables-addons-kmod.spec 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Aug 2010 02:43:25 -0000	1.5
+++ .cvsignore	27 Oct 2010 09:28:32 -0000	1.6
@@ -1 +1 @@
-xtables-addons-1.28.tar.xz
+xtables-addons-1.30.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Aug 2010 02:43:25 -0000	1.6
+++ sources	27 Oct 2010 09:28:32 -0000	1.7
@@ -1 +1 @@
-b94fe23370a1294b985e9a06a0f9d129  xtables-addons-1.28.tar.xz
+38d369a29fdd1ea86fe83df262e03064  xtables-addons-1.30.tar.xz


Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/xtables-addons-kmod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xtables-addons-kmod.spec	21 Oct 2010 19:45:45 -0000	1.28
+++ xtables-addons-kmod.spec	27 Oct 2010 09:28:32 -0000	1.29
@@ -3,20 +3,19 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
-#define buildforkernels current
+#define buildforkernels newest
+%define buildforkernels current
 #define buildforkernels akmods
 
 Name:		xtables-addons-kmod
 Summary:	Kernel module (kmod) for xtables-addons
-Version:	1.28
-Release:	1%{?dist}.4
+Version:	1.30
+Release:	1%{?dist}
 License:	GPLv2
 Group:		System Environment/Kernel
 URL:		http://xtables-addons.sourceforge.net
 Source0:	http://downloads.sourceforge.net/xtables-addons/xtables-addons-%{version}.tar.xz
 #Source11:	xtables-addons-kmodtool-excludekernel-filterfile
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # get the needed BuildRequires (in parts depending on what we build for)
 BuildRequires:	%{_bindir}/kmodtool
 %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -46,11 +45,11 @@
 
 %build
 for kernel_version  in %{?kernel_versions} ; do
-	if grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
-		sed -i 's/build_TEE=m/build_TEE=/' _kmod_build_${kernel_version%%___*}/mconfig
+	if ! grep -q 'XT_TARGET_TEE=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
+		sed -i 's/build_TEE=/build_TEE=m/' _kmod_build_${kernel_version%%___*}/mconfig
 	fi
-	if grep -q 'XT_TARGET_CHECKSUM=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
-		sed -i 's/build_CHECKSUM=m/build_CHECKSUM=/' _kmod_build_${kernel_version%%___*}/mconfig
+	if ! grep -q 'XT_TARGET_CHECKSUM=m' %{_usrsrc}/kernels/${kernel_version%%___*}/.config; then
+		sed -i 's/build_CHECKSUM=/build_CHECKSUM=m/' _kmod_build_${kernel_version%%___*}/mconfig
 	fi
 	export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
 	make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules
@@ -58,7 +57,6 @@
 
 
 %install
-rm -rf %{buildroot}
 for kernel_version  in %{?kernel_versions} ; do
 	export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*}
 	make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions _emodinst_ INSTALL_MOD_PATH=%{buildroot} ext-mod-dir=%{kmodinstdir_postfix}
@@ -70,17 +68,8 @@
 rm -rf %{buildroot}
 
 %changelog
-* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.28-1.4
-- rebuild for new kernel
-
-* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.28-1.3
-- rebuild for new kernel
-
-* Sat Sep 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.28-1.2
-- rebuild for new kernel
-
-* Fri Sep 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.28-1.1
-- rebuild for new kernel
+* Wed Oct 27 2010 Chen Lei <supercyper at 163.com> - 1.30-1
+- update to 1.30
 
 * Sun Jul 25 2010 Chen Lei <supercyper at 163.com> - 1.28-1
 - update to 1.28



More information about the rpmfusion-commits mailing list