Author: glen Date: Wed Jul 21 05:27:46 2010 GMT Module: packages Tag: HEAD ---- Log message: - update to build on ac
---- Files affected: packages/ipset: ipset.spec (1.69 -> 1.70) ---- Diffs: ================================================================ Index: packages/ipset/ipset.spec diff -u packages/ipset/ipset.spec:1.69 packages/ipset/ipset.spec:1.70 --- packages/ipset/ipset.spec:1.69 Mon Jul 19 15:57:17 2010 +++ packages/ipset/ipset.spec Wed Jul 21 07:27:41 2010 @@ -29,6 +29,7 @@ Source0: http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2 # Source0-md5: 9060d549a18c1c0794fa47a71343d627 Source1: %{pname}.init +Patch0: shadow-args.patch URL: http://ipset.netfilter.org/ %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} %{?with_userspace:BuildRequires: linux-libc-headers >= 7:2.6.22.1-2} @@ -104,6 +105,7 @@ %prep %setup -q -n %{pname}-%{version} +%patch0 -p1 mv kernel/{Kbuild,Makefile} # maximum number of ipsets. @@ -112,6 +114,13 @@ %{__sed} -i 's:$(IP_NF_SET_HASHSIZE):1024:' kernel/Makefile # these options can be overriden by module parameters. +%if "%{cc_version}" < "3.4" +%{__sed} -i -e 's/-Wextra//' Makefile +%{__sed} -i -e 's/-Winit-self//' Makefile +%{__sed} -i -e 's/-Wold-style-definition//' Makefile +%{__sed} -i -e 's/-Wno-missing-field-initializers//' Makefile +%endif + %build %if %{with userspace} %{__make} binaries \ @@ -141,15 +150,15 @@ MANDIR="%{_mandir}" \ BINDIR="%{_sbindir}" -install *.h $RPM_BUILD_ROOT%{_includedir} -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname} +cp -a *.h $RPM_BUILD_ROOT%{_includedir} +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname} %endif %if %{with kernel} cd kernel %install_kernel_modules -m ip_set -d kernel/net/ipv4/netfilter -install ip_set_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter -install ipt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter +install -p ip_set_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter +install -p ipt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter cd - %endif @@ -200,6 +209,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.70 2010/07/21 05:27:41 glen +- update to build on ac + Revision 1.69 2010/07/19 13:57:17 paszczus - added Suggests: kernel-net-ipset ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset.spec?r1=1.69&r2=1.70&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
