bugfixes in build - still can't build as the patch file is not right

diff --git a/Makefile b/Makefile
index 99c4681..bd67eb9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ ALL                     += iptables
 iptables-URL1          := http://mirror.onelab.eu/third-party/iptables-1.4.12.1.tar.bz2
 iptables-URL2          := http://planet-lab.org/third-party/iptables-1.4.12.1.tar.bz2
 iptables-SHA1SUM       := 86022c3b5129ad7105f5087ec1349e99cc5a9728
-iptables               := $(notdir $(iptables-URL))
+iptables               := $(notdir $(iptables-URL1))
 
 ##############################
 define download_target

diff --git a/iptables.spec b/iptables.spec
index 578554e..9ca19a0 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -4,6 +4,7 @@
 %define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define actual_name %{name}-%{version}%{subversion}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -14,7 +15,7 @@ Summary: Tools for managing Linux kernel packet filtering capabilities
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}%{subversion}.tar.bz2
+Source: http://www.netfilter.org/projects/iptables/files/%{actual_name}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Source3: planetlab-config
@@ -63,7 +64,7 @@ The iptc interface is upstream marked as not public. The interface is not
 stable and may change with every new version. It is therefore unsupported.
 
 %prep
-%setup -q
+%setup -q -n %{actual_name}
 %patch1 -p1 
 
 %build