From 49080e42a566becc16ded20c6747437eda2c568754efeb63b9edd404e9152d19 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 15 Aug 2011 12:06:41 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/curl revision 62.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=f6a5d00f377b42d882c94021b3ba2976 --- curl.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/curl.spec b/curl.spec index 6252c66..7f7a0a8 100644 --- a/curl.spec +++ b/curl.spec @@ -38,7 +38,7 @@ BuildRequires: stunnel %endif #define cvs_suffix -20090302 Version: 7.21.7 -Release: 1 +Release: 4 AutoReqProv: on # bug437293 %ifarch ppc64 @@ -53,6 +53,7 @@ Source: curl-%version%{?cvs_suffix}.tar.lzma Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: curl-openssl-release-buffers.patch + %description Curl is a client to get documents and files from or send documents to a server using any of the supported protocols (HTTP, HTTPS, FTP, FTPS, @@ -85,6 +86,7 @@ user interaction or any kind of interactivity. %prep %setup -q -n curl-%version%{?cvs_suffix} %patch + %build # local hack to make curl-config --libs stop printing libraries it depends on # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere, From 7b671dfcc3f519102d4649b907656513600deca186aa85be98513fd8297db9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 16 Sep 2011 18:30:01 +0000 Subject: [PATCH 2/3] Accepting request 82516 from home:jengelh:bl - Add curl-devel to baselibs OBS-URL: https://build.opensuse.org/request/show/82516 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=55 --- baselibs.conf | 4 +++- curl.changes | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index 29e0626..50dcdd7 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,6 @@ libcurl4 obsoletes "curl- <= " provides "curl- = " - +curl-devel + requires -curl- + requires "libcurl4- = " diff --git a/curl.changes b/curl.changes index b101832..73f434f 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 16 17:22:44 UTC 2011 - jengelh@medozas.de + +- Add curl-devel to baselibs + ------------------------------------------------------------------- Mon Aug 15 05:05:01 UTC 2011 - crrodriguez@opensuse.org From 9cad9a3042cf9f40c4c19f616b85035627a80dc0bf27139024b6a69e80a593cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 18 Sep 2011 18:45:34 +0000 Subject: [PATCH 3/3] Accepting request 83159 from home:jengelh:bl-c - Remove redundant tags/sections from specfile - Use %_smp_mflags for parallel build OBS-URL: https://build.opensuse.org/request/show/83159 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=56 --- curl.changes | 6 ++++++ curl.spec | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/curl.changes b/curl.changes index 73f434f..122c29f 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 18 00:10:42 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + ------------------------------------------------------------------- Fri Sep 16 17:22:44 UTC 2011 - jengelh@medozas.de diff --git a/curl.spec b/curl.spec index 7f7a0a8..b647d41 100644 --- a/curl.spec +++ b/curl.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %bcond_without openssl %bcond_with mozilla_nss @@ -39,7 +38,6 @@ BuildRequires: stunnel #define cvs_suffix -20090302 Version: 7.21.7 Release: 4 -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: curl-64bit @@ -115,7 +113,7 @@ export CFLAGS="%{optflags}" : if this fails, the above sed hack did not work ./libtool --config | grep -q link_all_deplibs=no # enable-hidden-symbols needs gcc4 and causes that curl exports only its API -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %if %{with testsuite} @@ -145,9 +143,6 @@ rm $RPM_BUILD_ROOT%_libdir/libcurl.la install -d $RPM_BUILD_ROOT/usr/share/aclocal install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/ -%clean -rm -rf $RPM_BUILD_ROOT - %post -n libcurl4 -p /sbin/ldconfig %postun -n libcurl4 -p /sbin/ldconfig