From ee3d9c06d65642a011136896e3564d761fa03e4d Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Mon, 20 Feb 2006 18:47:03 +0000 Subject: [PATCH] - upgrade to 1.3.2-20050720 - actually use the KERNEL_DIR that we probed in the make command line --- iptables.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/iptables.spec b/iptables.spec index 72c1b65..b3fa756 100644 --- a/iptables.spec +++ b/iptables.spec @@ -1,6 +1,6 @@ %define name iptables -%define version 1.2.9 -%define release 2.3.1.1%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define version 1.3.2 +%define release 20050720.1%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central @@ -76,9 +76,9 @@ for KERNEL_DIR in $RPM_BUILD_DIR/linux-* /lib/modules/`uname -r`/build /usr ; do break fi done -make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} -make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} iptables-save iptables-restore -make COPT_FLAGS="$OPT" KERNEL_DIR=/usr LIBDIR=/%{_lib} ip6tables-save ip6tables-restore +make COPT_FLAGS="$OPT" KERNEL_DIR=$KERNEL_DIR LIBDIR=/%{_lib} +make COPT_FLAGS="$OPT" KERNEL_DIR=$KERNEL_DIR LIBDIR=/%{_lib} iptables-save iptables-restore +make COPT_FLAGS="$OPT" KERNEL_DIR=$KERNEL_DIR LIBDIR=/%{_lib} ip6tables-save ip6tables-restore %install # bootstrap to avoid BuildRequires of kernel-source @@ -87,9 +87,9 @@ for KERNEL_DIR in $RPM_BUILD_DIR/linux-* /lib/modules/`uname -r`/build /usr ; do break fi done -make install DESTDIR=%{buildroot} KERNEL_DIR=/usr BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir} +make install DESTDIR=%{buildroot} KERNEL_DIR=$KERNEL_DIR BINDIR=/sbin LIBDIR=/%{_lib} MANDIR=%{_mandir} %if %{build_devel} -make install-devel DESTDIR=%{buildroot} KERNEL_DIR=/usr BINDIR=/sbin LIBDIR=%{_libdir} MANDIR=%{_mandir} +make install-devel DESTDIR=%{buildroot} KERNEL_DIR=$KERNEL_DIR BINDIR=/sbin LIBDIR=%{_libdir} MANDIR=%{_mandir} %endif cp ip{6,}tables-{save,restore} $RPM_BUILD_ROOT/sbin cp iptables-*.8 $RPM_BUILD_ROOT%{_mandir}/man8 -- 2.47.0