rpms/curl/F-9 curl.spec,1.83,1.84
Kamil Dudka
kdudka at fedoraproject.org
Mon Mar 16 08:18:34 UTC 2009
- Previous message: rpms/python-xmpp/EL-5 import.log, NONE, 1.1 xmpppy-auth-fixes.diff, NONE, 1.1 xmpppy-dispatcher.diff, NONE, 1.1 xmpppy-extra-xep-refs.diff, NONE, 1.1 xmpppy-gajim-simplexml-updates.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 python-xmpp.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/logwatch/F-10 logwatch-7.3.6-zz-disk_space2.patch, NONE, 1.1 logwatch.spec, 1.103, 1.104
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kdudka
Update of /cvs/extras/rpms/curl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21650
Modified Files:
curl.spec
Log Message:
make libcurl-devel multilib-ready (bug #488922)
Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-9/curl.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- curl.spec 6 Mar 2009 14:19:55 -0000 1.83
+++ curl.spec 16 Mar 2009 08:18:03 -0000 1.84
@@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 7.19.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -81,6 +81,29 @@
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
+
+%ifarch ppc64 s390x x86_64 ia64 alpha sparc64
+%define _curlbuild_h %{_curlbuild64_h}
+%else
+%define _curlbuild_h %{_curlbuild32_h}
+%endif
+mv $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h \
+ $RPM_BUILD_ROOT%{_includedir}/curl/%{_curlbuild_h}
+cat > $RPM_BUILD_ROOT%{_includedir}/curl/curlbuild.h << EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "%{_curlbuild32_h}"
+#elif __WORDSIZE == 64
+#include "%{_curlbuild64_h}"
+#else
+#error "Unknown word size"
+#endif
+EOF
# don't need curl's copy of the certs; use openssl's
find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \;
@@ -117,6 +140,9 @@
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Mon Mar 16 2009 Kamil Dudka <kdudka at redhat.com> 7.19.4-3
+- make libcurl-devel multilib-ready (bug #488922)
+
* Fri Mar 06 2009 Jindrich Novy <jnovy at redhat.com> 7.19.4-2
- drop .easy-leak patch, causes problems in pycurl (#488791)
- fix libcurl-devel dependencies (#488895)
- Previous message: rpms/python-xmpp/EL-5 import.log, NONE, 1.1 xmpppy-auth-fixes.diff, NONE, 1.1 xmpppy-dispatcher.diff, NONE, 1.1 xmpppy-extra-xep-refs.diff, NONE, 1.1 xmpppy-gajim-simplexml-updates.diff, NONE, 1.1 .cvsignore, 1.3, 1.4 python-xmpp.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/logwatch/F-10 logwatch-7.3.6-zz-disk_space2.patch, NONE, 1.1 logwatch.spec, 1.103, 1.104
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list