From 1cc66ac0392952f433c5b99c3211f0b181aa1101 Mon Sep 17 00:00:00 2001 From: Anatoliy Grigorenko Date: Wed, 4 Jul 2012 18:06:35 +0400 Subject: [PATCH] update --- .abf.yml | 2 +- curl-7.15.3-multilib.patch | 15 ++-- curl-7.18.2-do-not-build-examples.patch | 24 ------- curl-7.21.7.tar.lzma.asc | 7 -- curl-7.26.0-do-not-build-examples.patch | 24 +++++++ curl-7.26.0.tar.lzma.asc | 7 ++ curl.spec | 91 ++++++++++++++----------- 7 files changed, 91 insertions(+), 79 deletions(-) delete mode 100644 curl-7.18.2-do-not-build-examples.patch delete mode 100644 curl-7.21.7.tar.lzma.asc create mode 100644 curl-7.26.0-do-not-build-examples.patch create mode 100644 curl-7.26.0.tar.lzma.asc diff --git a/.abf.yml b/.abf.yml index 90b020b..b77174c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "curl-7.21.7.tar.lzma": c611a792d9a0da8767a6d1eb90fecb8a8b3a3b06 + "curl-7.26.0.tar.lzma": 724084a1cbfe5e1899b584f1268e221046b6e82d diff --git a/curl-7.15.3-multilib.patch b/curl-7.15.3-multilib.patch index 61a6376..9524bfb 100644 --- a/curl-7.15.3-multilib.patch +++ b/curl-7.15.3-multilib.patch @@ -1,7 +1,6 @@ -diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in ---- curl-7.18.0/curl-config.in.multilib 2008-01-10 23:14:02.000000000 +0100 -+++ curl-7.18.0/curl-config.in 2008-01-28 21:37:50.000000000 +0100 -@@ -72,7 +72,7 @@ +--- curl-7.25.0/curl-config.in.multilib~ 2012-03-16 22:42:16.000000000 +0100 ++++ curl-7.25.0/curl-config.in 2012-03-23 11:27:45.122955323 +0100 +@@ -74,7 +74,7 @@ while test $# -gt 0; do ;; --cc) @@ -10,7 +9,7 @@ diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in ;; --prefix) -@@ -189,16 +189,7 @@ +@@ -136,16 +136,7 @@ while test $# -gt 0; do ;; --libs) @@ -20,11 +19,11 @@ diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in - CURLLIBDIR="" - fi - if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then -- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@ +- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@ - else -- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@ +- echo ${CURLLIBDIR}-lcurl @LIBS@ - fi -+ pkg-config libcurl --libs ++ pkg-config libcurl --libs ;; --static-libs) diff --git a/curl-7.18.2-do-not-build-examples.patch b/curl-7.18.2-do-not-build-examples.patch deleted file mode 100644 index cb8fded..0000000 --- a/curl-7.18.2-do-not-build-examples.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -p -up curl-7.18.2/docs/Makefile.am.pix curl-7.18.2/docs/Makefile.am ---- curl-7.18.2/docs/Makefile.am.pix 2005-10-28 23:34:51.000000000 +0200 -+++ curl-7.18.2/docs/Makefile.am 2008-07-02 13:41:46.000000000 +0200 -@@ -10,7 +10,7 @@ PDFPAGES = curl.pdf curl-config.pdf - - HTMLPAGES = $(GENHTMLPAGES) index.html - --SUBDIRS = examples libcurl -+SUBDIRS = libcurl - - CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) - -diff -p -up curl-7.18.2/docs/Makefile.in.pix curl-7.18.2/docs/Makefile.in ---- curl-7.18.2/docs/Makefile.in.pix 2008-07-02 13:35:46.000000000 +0200 -+++ curl-7.18.2/docs/Makefile.in 2008-07-02 13:41:52.000000000 +0200 -@@ -212,7 +212,7 @@ man_MANS = curl.1 curl-config.1 - GENHTMLPAGES = curl.html curl-config.html - PDFPAGES = curl.pdf curl-config.pdf - HTMLPAGES = $(GENHTMLPAGES) index.html --SUBDIRS = examples libcurl -+SUBDIRS = libcurl - CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) - EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS \ - README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS \ diff --git a/curl-7.21.7.tar.lzma.asc b/curl-7.21.7.tar.lzma.asc deleted file mode 100644 index eaa2a04..0000000 --- a/curl-7.21.7.tar.lzma.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAk4C+RkACgkQeOEcayedXJE+zgCgpoA3RZSH/V7Pt2r+V4vw6XzE -l4gAoI6vUkMdpsA0HZb3qVU7xj+UeZAC -=XD6y ------END PGP SIGNATURE----- diff --git a/curl-7.26.0-do-not-build-examples.patch b/curl-7.26.0-do-not-build-examples.patch new file mode 100644 index 0000000..dd81ecf --- /dev/null +++ b/curl-7.26.0-do-not-build-examples.patch @@ -0,0 +1,24 @@ +diff -urN curl-7.26.0/docs/Makefile.am curl-7.26.0-patched/docs/Makefile.am +--- curl-7.26.0/docs/Makefile.am 2012-04-28 05:25:35.000000000 +1100 ++++ curl-7.26.0-patched/docs/Makefile.am 2012-05-25 22:18:53.079301961 +1100 +@@ -28,7 +28,7 @@ + + HTMLPAGES = $(GENHTMLPAGES) index.html + +-SUBDIRS = examples libcurl ++SUBDIRS = libcurl + + CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) + +diff -urN curl-7.26.0/docs/Makefile.in curl-7.26.0-patched/docs/Makefile.in +--- curl-7.26.0/docs/Makefile.in 2012-05-23 08:46:41.000000000 +1100 ++++ curl-7.26.0-patched/docs/Makefile.in 2012-05-25 22:18:58.485301905 +1100 +@@ -302,7 +302,7 @@ + GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html + PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf + HTMLPAGES = $(GENHTMLPAGES) index.html +-SUBDIRS = examples libcurl ++SUBDIRS = libcurl + CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) + EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS \ + README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS \ diff --git a/curl-7.26.0.tar.lzma.asc b/curl-7.26.0.tar.lzma.asc new file mode 100644 index 0000000..1570d24 --- /dev/null +++ b/curl-7.26.0.tar.lzma.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iEYEABECAAYFAk++XP4ACgkQeOEcayedXJGItwCgtc6ECD4l6E7Q4ZEJDOzBB5bQ +LWoAoLFWWUbcd+sBu/+s6fOGxgETHqT2 +=4I4f +-----END PGP SIGNATURE----- diff --git a/curl.spec b/curl.spec index 048e532..623e8b8 100644 --- a/curl.spec +++ b/curl.spec @@ -4,8 +4,8 @@ Summary: Gets a file from a FTP, GOPHER or HTTP server Name: curl -Version: 7.21.7 -Release: %mkrel 2 +Version: 7.26.0 +Release: %mkrel 1 Epoch: 1 License: BSD-like Group: Networking/Other @@ -14,7 +14,7 @@ Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source1: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc Patch3: %{name}-7.21.5-privlibs.patch Patch4: %{name}-7.15.3-multilib.patch -Patch6: %{name}-7.18.2-do-not-build-examples.patch +Patch6: %{name}-7.26.0-do-not-build-examples.patch BuildRequires: groff-for-man BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -26,8 +26,7 @@ BuildRequires: krb5-devel # (misc) required for testing BuildRequires: stunnel Provides: webfetch -Requires: %{libname} = %{epoch}:%{version}-%{release} -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires: %{libname} = %{EVRD} %description curl is a client to get documents/files from servers, using any of the @@ -42,9 +41,7 @@ This version is compiled with SSL (https) support. %package -n %{libname} Summary: A library of functions for file transfer Group: Networking/Other -%if %mdkversion >= 200700 Requires: rootcerts >= 1:20070713.00 -%endif %description -n %{libname} libcurl is a library of functions for sending and receiving files through @@ -56,10 +53,10 @@ use libcurl. %package -n %{develname} Summary: Header files and static libraries for libcurl Group: Development/C -Requires: %{libname} = %{epoch}:%{version}-%{release} -Provides: %{name}-devel = %{epoch}:%{version}-%{release} -Provides: lib%{name}-devel = %{epoch}:%{version}-%{release} -Provides: libcurl%{major}-devel = %{epoch}:%{version}-%{release} +Requires: %{libname} = %{EVRD} +Provides: %{name}-devel = %{EVRD} +Provides: lib%{name}-devel = %{EVRD} +Provides: libcurl%{major}-devel = %{EVRD} Obsoletes: %mklibname %{name} 4 -d Provides: %mklibname %{name} 4 -d @@ -73,16 +70,16 @@ use libcurl. %package examples Summary: Example files for %{name} development Group: Development/C -Requires: %{develname} = %{epoch}:%{version}-%{release} +Requires: %{develname} = %{EVRD} %description examples Example files for %{name} development. %prep %setup -q -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 +%patch3 -p1 -b .privlib~ +%patch4 -p1 -b .multilib~ +%patch6 -p1 -b .examples~ %build autoreconf -fiv @@ -107,74 +104,90 @@ autoreconf -fiv --disable-ares # we don't want them in curl-examples: -rm -r docs/examples/.deps +%__rm -r docs/examples/.deps %make # disable tests that want to connect/run sshd, which is quite impossible %check -make test TEST_Q='-a -p -v !SCP !SFTP !SOCKS4 !SOCKS5 !TFTP !198' +%__make test TEST_Q='-a -p -v !SCP !SFTP !SOCKS4 !SOCKS5 !TFTP !198' %install -rm -rf %{buildroot} +%__rm -rf %{buildroot} %makeinstall_std # [july 2008] HACK. to be replaced by a real fix -sed -i -e 's!-Wl,--as-needed!!' -e 's!-Wl,--no-undefined!!' %{buildroot}%{_bindir}/%{name}-config -sed -i -e 's!-Wl,--as-needed!!' -e 's!-Wl,--no-undefined!!' %{buildroot}%{_libdir}/pkgconfig/*.pc +%__sed -i -e 's!-Wl,--as-needed!!' -e 's!-Wl,--no-undefined!!' %{buildroot}%{_bindir}/%{name}-config +%__sed -i -e 's!-Wl,--as-needed!!' -e 's!-Wl,--no-undefined!!' %{buildroot}%{_libdir}/pkgconfig/*.pc %multiarch_binaries %{buildroot}%{_bindir}/%{name}-config # (tpg) use rootcerts's certificates #35917 find %{buildroot} -name ca-bundle.crt -exec rm -f '{}' \; -%if "%{_lib}" == "lib64" -perl -pi -e "s|-L/usr/lib\b|-L%{_libdir}|g" %{buildroot}%{_libdir}/*.la -%endif +# nuke the static lib +%__rm -f %{buildroot}%{_libdir}/*.a + +# we don't package mk-ca-bundle so we don't need man for it +%__rm -f %{buildroot}%{_mandir}/man1/mk-ca-bundle.1* %clean -rm -rf %{buildroot} - -%if %mdkversion < 200900 -%post -n %{libname} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{libname} -p /sbin/ldconfig -%endif +%__rm -rf %{buildroot} %files -%defattr(-,root,root) %{_bindir}/curl %{_mandir}/man1/curl.1* %files -n %{libname} -%defattr(-,root,root) %{_libdir}/*.so.%{major}* %files -n %{develname} -%defattr(-,root,root) %docdir docs/ %doc docs/BUGS docs/KNOWN_BUGS docs/CONTRIBUTE docs/FAQ CHANGES %doc docs/FEATURES docs/RESOURCES docs/TODO docs/THANKS docs/INTERNALS %{_bindir}/curl-config %{multiarch_bindir}/curl-config %{_libdir}/libcurl.so +%{_libdir}*/libcurl.la %{_includedir}/curl -%{_libdir}/libcurl*a %{_libdir}/pkgconfig/*.pc %{_mandir}/man1/curl-config.1* %{_mandir}/man3/* %files examples -%defattr(-,root,root,644) %doc docs/examples %changelog -* Wed Feb 22 2012 abf -- The release updated by ABF +* Fri May 25 2012 Andrey Bondrov 1:7.26.0-1mdv2012.0 ++ Revision: 800634 +- New version 7.26.0, keep .la file for < 201200, re-diff examples patch -* Thu Jun 23 2011 Funda Wang 1:7.21.7-1mdv2011.0 +* Fri Mar 23 2012 Bernhard Rosenkraenzer 1:7.25.0-1 ++ Revision: 786368 +- 7.25.0 + +* Mon Feb 13 2012 Andrey Bondrov 1:7.24.0-1 ++ Revision: 773770 +- New version 7.24.0 + +* Tue Jan 10 2012 Bernhard Rosenkraenzer 1:7.23.1-1 ++ Revision: 759630 +- Update to 7.23.1 + +* Mon Nov 28 2011 Oden Eriksson 1:7.23.0-2 ++ Revision: 734996 +- remove the static lib and the libtool *.la file + +* Thu Nov 17 2011 Andrey Bondrov 1:7.23.0-1 ++ Revision: 731260 +- New version 7.23.0 + +* Wed Oct 05 2011 Andrey Bondrov 1:7.22.0-1 ++ Revision: 703091 +- New version: 7.22.0 + +* Thu Jun 23 2011 Funda Wang 1:7.21.7-1 + Revision: 686821 - update to new version 7.21.7