From 38c8d77d41da682241a93fa351aac90568fee973 Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Wed, 30 Nov 2005 15:00:22 +0000 Subject: [PATCH] - fix curl-config bug 174556 - missing vernum value --- curl-7.15.0-curl_config-version.patch | 12 ++++++++++++ curl.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 curl-7.15.0-curl_config-version.patch diff --git a/curl-7.15.0-curl_config-version.patch b/curl-7.15.0-curl_config-version.patch new file mode 100644 index 0000000..c1a4fb3 --- /dev/null +++ b/curl-7.15.0-curl_config-version.patch @@ -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 diff --git a/curl.spec b/curl.spec index f73cae7..eb7e73a 100644 --- a/curl.spec +++ b/curl.spec @@ -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 7.15.0-3 +- fix curl-config bug 174556 - missing vernum value + * Wed Nov 9 2005 Ivana Varekova 7.15.0-2 - rebuilt