From bd7b72523ab054f4093f530c02c5e760c4edee71 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Wed, 24 Jun 2009 14:14:53 +0000
Subject: [PATCH] fix bug introduced by the last build (#504857)

---
 curl.spec   | 13 ++++++-------
 curlbuild.h |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/curl.spec b/curl.spec
index a07a8e9..8d3f738 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -87,14 +87,10 @@ install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
 
 # Make libcurl-devel multilib-ready (bug #488922)
-# solution taken from python.spec
-%define _curlbuild32_h curlbuild-32.h
-%define _curlbuild64_h curlbuild-64.h
-
 %if 0%{?__isa_bits} == 64
-%define _curlbuild_h %{_curlbuild64_h}
+%define _curlbuild_h curlbuild-64.h
 %else
-%define _curlbuild_h %{_curlbuild32_h}
+%define _curlbuild_h curlbuild-32.h
 %endif
 mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \
    $RPM_BUILD_ROOT%{_includedir}/curl/%{_curlbuild_h}
@@ -136,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Jun 24 2009 Kamil Dudka <kdudka@redhat.com> 7.19.5-4
+- fix bug introduced by the last build (#504857)
+
 * Wed Jun 24 2009 Kamil Dudka <kdudka@redhat.com> 7.19.5-3
 - exclude curlbuild.h content from spec (#504857)
 
diff --git a/curlbuild.h b/curlbuild.h
index 8e1bee2..b488626 100644
--- a/curlbuild.h
+++ b/curlbuild.h
@@ -1,9 +1,9 @@
 #include <bits/wordsize.h>
 
 #if __WORDSIZE == 32
-#include "%{_curlbuild32_h}"
+#include "curlbuild-32.h"
 #elif __WORDSIZE == 64
-#include "%{_curlbuild64_h}"
+#include "curlbuild-64.h"
 #else
 #error "Unknown word size"
 #endif