rpms/iptables/devel iptables.spec,1.64,1.65

Thomas Woerner (twoerner) fedora-extras-commits at redhat.com
Mon Mar 3 11:08:22 UTC 2008


Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10657

Modified Files:
	iptables.spec 
Log Message:
- force usage of kernel-devel in build environment instead of uname detected
  kernel



Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- iptables.spec	3 Mar 2008 10:20:41 -0000	1.64
+++ iptables.spec	3 Mar 2008 11:07:40 -0000	1.65
@@ -1,4 +1,5 @@
 %define build_devel 1
+%define _kernel $(ls -d /usr/src/kernels/*/ | head -1)
 
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
@@ -15,7 +16,7 @@
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: GPLv2
 BuildRequires: libselinux-devel
-BuildRequires: kernel, kernel-devel
+BuildRequires: kernel-devel
 Conflicts: kernel < 2.4.20
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -73,9 +74,8 @@
 OPT="$RPM_OPT_FLAGS -I$TOPDIR/include -fPIC"
 #export KERNEL_DIR=/usr
 #export KBUILD_OUTPUT=/usr
-export KERNEL_DIR="/lib/modules/%{uname}/source"
-export KBUILD_OUTPUT="/lib/modules/%{uname}/build"
-
+export KERNEL_DIR=%{_kernel}
+export KBUILD_OUTPUT=%{_kernel}
 
 export DO_SELINUX=1
 make COPT_FLAGS="$OPT" LIBDIR=/%{_lib} 
@@ -86,6 +86,8 @@
 rm -rf %{buildroot}
 #export KERNEL_DIR=/usr
 #export KBUILD_OUTPUT=/usr
+export KERNEL_DIR=%{_kernel}
+export KBUILD_OUTPUT=%{_kernel}
 export DO_SELINUX=1
 make install DESTDIR=%{buildroot} BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir}
 %if %{build_devel}




More information about the fedora-extras-commits mailing list