- fix curl-config bug 174556 - missing vernum value

This commit is contained in:
Ivana Varekova 2005-11-30 15:00:22 +00:00
parent f5764a91f4
commit 38c8d77d41
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
--- curl-7.15.0/configure.ac.ver 2005-11-30 13:33:54.360624896 +0100
+++ curl-7.15.0/configure.ac 2005-11-30 13:34:14.009637792 +0100
@@ -43,7 +43,8 @@
dnl
dnl we extract the numerical version for curl-config only
-VERSIONNUM=`$SED -ne 's/^#define LIBCURL_VERSION_NUM 0x\(.*\)/\1/p' ${srcdir}/include/curl/curlver.h`
+VERSIONNUM=`$SED -rne 's/^#define LIBCURL_VERSION_(MAJOR|MINOR|PATCH) ([^ ]*)$/\2/p' ${srcdir}/include/curl/curlver.h | xargs -n1 printf %02x; echo`
+
AC_SUBST(VERSIONNUM)
dnl Solaris pkgadd support definitions

View File

@ -1,11 +1,12 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
Name: curl
Version: 7.15.0
Release: 2
Release: 3
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Patch0: curl-7.14.1-nousr.patch
Patch1: curl-7.15.0-curl_config-version.patch
URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
@ -34,6 +35,7 @@ rm -rf $RPM_BUILD_ROOT
%setup -q
%patch0 -p1 -b .nousr
%patch1 -p1 -b .ver
%build
aclocal
@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
* Wed Nov 30 2005 Ivana Varekova <varekova@redhat.com> 7.15.0-3
- fix curl-config bug 174556 - missing vernum value
* Wed Nov 9 2005 Ivana Varekova <varekova@redhat.com> 7.15.0-2
- rebuilt