rpms/curl/devel curl.spec,1.101,1.102 curlbuild.h,1.1,1.2

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10458

Modified Files:
	curl.spec curlbuild.h 
Log Message:
fix bug introduced by the last build (#504857)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -p -r1.101 -r1.102
--- curl.spec	24 Jun 2009 13:40:32 -0000	1.101
+++ curl.spec	24 Jun 2009 14:14:52 -0000	1.102
@@ -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}/a
 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 at redhat.com> 7.19.5-4
+- fix bug introduced by the last build (#504857)
+
 * Wed Jun 24 2009 Kamil Dudka <kdudka at redhat.com> 7.19.5-3
 - exclude curlbuild.h content from spec (#504857)
 


Index: curlbuild.h
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curlbuild.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- curlbuild.h	24 Jun 2009 13:40:32 -0000	1.1
+++ curlbuild.h	24 Jun 2009 14:14:53 -0000	1.2
@@ -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