SPECS: xtables-addons.spec - now builds, still needs more work; TO...
zbyniu
zbyniu at pld-linux.org
Mon Mar 10 00:07:38 CET 2008
Author: zbyniu Date: Sun Mar 9 23:07:38 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- now builds, still needs more work; TODO added
---- Files affected:
SPECS:
xtables-addons.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SPECS/xtables-addons.spec
diff -u SPECS/xtables-addons.spec:1.2 SPECS/xtables-addons.spec:1.3
--- SPECS/xtables-addons.spec:1.2 Sun Mar 9 23:05:12 2008
+++ SPECS/xtables-addons.spec Mon Mar 10 00:07:32 2008
@@ -1,5 +1,9 @@
# $Revision$, $Date$
#
+# TODO
+# - kernel modules package
+# - build userspace in %build, not %install
+#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
#
@@ -23,7 +27,6 @@
BuildRequires: xtables-devel >= 1.5.2
%if %{with dist_kernel} && %{netfilter_snap} != 0
BuildRequires: kernel%{_alt_kernel}-headers(netfilter) >= %{netfilter_snap}
-BuildRequires: kernel%{_alt_kernel}-source
%endif
BuildConflicts: kernel-headers < 2.3.0
Provides: firewall-userspace-tool
@@ -60,11 +63,15 @@
%configure \
--with-kbuild=%{_kernelsrcdir} \
--with-ksource=%{_kernelsrcdir}
-%{__make}
+export XA_TOPSRCDIR=$PWD
+%build_kernel_modules -C extensions -m compat_xtables
+#{__make}
%install
rm -rf $RPM_BUILD_ROOT
+%install_kernel_modules -m extensions/compat_xtables -d kernel/net/netfilter
+install extensions/xt_*ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -74,7 +81,7 @@
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/xtables/*.so
-%{_mandir}/man8/*
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -82,9 +89,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2008-03-09 23:07:32 zbyniu
+- now builds, still needs more work; TODO added
+
Revision 1.2 2008-03-09 22:05:12 arekm
- update paths
Revision 1.1 2008-03-09 21:56:56 arekm
- initial
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xtables-addons.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list