rpms/curl
8
0
Fork 1
Code Issues Pull Requests Releases Activity

fix bug introduced by the last build (#504857)

Browse Source
This commit is contained in:
Kamil Dudka 2009-06-24 14:14:53 +00:00
parent dbbc4693d4
commit bd7b72523a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
curl.spec
View File

@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.19.5 Version: 7.19.5
Release: 3%{?dist} Release: 4%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 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 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
# Make libcurl-devel multilib-ready (bug #488922) # 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 %if 0%{?__isa_bits} == 64
%define _curlbuild_h %{_curlbuild64_h} %define _curlbuild_h curlbuild-64.h
%else %else
%define _curlbuild_h %{_curlbuild32_h} %define _curlbuild_h curlbuild-32.h
%endif %endif
mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \ mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \
$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 %{_datadir}/aclocal/libcurl.m4
%changelog %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 * Wed Jun 24 2009 Kamil Dudka <kdudka@redhat.com> 7.19.5-3
- exclude curlbuild.h content from spec (#504857) - exclude curlbuild.h content from spec (#504857)

4
curlbuild.h
View File

@ -1,9 +1,9 @@
#include <bits/wordsize.h> #include <bits/wordsize.h>
#if __WORDSIZE == 32 #if __WORDSIZE == 32
#include "%{_curlbuild32_h}" #include "curlbuild-32.h"
#elif __WORDSIZE == 64 #elif __WORDSIZE == 64
#include "%{_curlbuild64_h}" #include "curlbuild-64.h"
#else #else
#error "Unknown word size" #error "Unknown word size"
#endif #endif