Author: supercyper Update of /cvs/free/rpms/xtables-addons-kmod/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29672 Modified Files: .cvsignore sources xtables-addons-kmod.spec Log Message: Update to 1.27 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 May 2010 02:49:43 -0000 1.3 +++ .cvsignore 31 May 2010 02:32:43 -0000 1.4 @@ -1 +1 @@ -xtables-addons-1.26.tar.bz2 +xtables-addons-1.27.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xtables-addons-kmod/F-13/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 May 2010 02:49:43 -0000 1.4 +++ sources 31 May 2010 02:32:43 -0000 1.5 @@ -1 +1 @@ -6091032318ee7fb46d82dec9ae5ae422 xtables-addons-1.26.tar.bz2 +f4f65ce5361d7f8c0908ca3db37fa8ee xtables-addons-1.27.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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xtables-addons-kmod.spec 28 May 2010 14:34:31 -0000 1.13 +++ xtables-addons-kmod.spec 31 May 2010 02:32:43 -0000 1.14 @@ -3,26 +3,26 @@ # "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.26 -Release: 1%{?dist}.5 +Version: 1.27 +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}... -Source11: xtables-addons-kmodtool-excludekernel-filterfile +Source0: http://downloads.sourceforge.net/xtables-addons/xtables-addons-%{version}... +#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} } # kmodtool does its magic here -%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description Xtables-addons provides extra modules for iptables not present in the kernel, @@ -36,7 +36,7 @@ # error out if there was something wrong with kmodtool %{?kmodtool_check} # print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null +kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -q -c -T -a 0 for kernel_version in %{?kernel_versions} ; do @@ -47,16 +47,15 @@ %build for kernel_version in %{?kernel_versions} ; do export XA_ABSTOPSRCDIR=${PWD}/_kmod_build_${kernel_version%%___*} - make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules + make %{?_smp_mflags} V=1 -C "${kernel_version##*___}" M=${PWD}/_kmod_build_${kernel_version%%___*}/extensions modules done %install rm -rf %{buildroot} for kernel_version in %{?kernel_versions} ; do - find _kmod_build_${kernel_version%%___*}/extensions -name "*.ko" -exec mv {} _kmod_build_${kernel_version%%___*}/extensions ";" - install -dm 755 %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} - install -pm 755 _kmod_build_${kernel_version%%___*}/extensions/*.ko %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} + 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} done chmod u+x %{buildroot}/lib/modules/*/extra/*/* %{?akmod_install} @@ -66,8 +65,8 @@ %changelog -* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.26-1.5 -- rebuild for new kernel +* Mon May 31 2010 Chen Lei <supercyper(a)163.com&gt; - 1.27-1 +- update to 1.27 * Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.26-1.4 - rebuild for new kernel