rpms/curl/devel curl-7.15.0-curl_config-version.patch, NONE, 1.1 curl.spec, 1.28, 1.29

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Nov 30 15:00:34 UTC 2005


Author: varekova

Update of /cvs/dist/rpms/curl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30895

Modified Files:
	curl.spec 
Added Files:
	curl-7.15.0-curl_config-version.patch 
Log Message:
- fix curl-config bug 174556 - missing vernum value


curl-7.15.0-curl_config-version.patch:
 configure.ac |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE curl-7.15.0-curl_config-version.patch ---
--- 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


Index: curl.spec
===================================================================
RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- curl.spec	9 Nov 2005 08:25:02 -0000	1.28
+++ curl.spec	30 Nov 2005 15:00:22 -0000	1.29
@@ -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 @@
 
 %setup -q 
 %patch0 -p1 -b .nousr
+%patch1 -p1 -b .ver
 
 %build
 aclocal
@@ -88,6 +90,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 30 2005 Ivana Varekova <varekova at redhat.com> 7.15.0-3
+- fix curl-config bug 174556 - missing vernum value
+
 * Wed Nov  9 2005 Ivana Varekova <varekova at redhat.com> 7.15.0-2
 - rebuilt
 




More information about the fedora-cvs-commits mailing list