Accepting request 261640 from home:vitezslav_cizek:branches:devel:libraries:c_c++

- update to 7.39.0:
- changes:
    SSLv3 is disabled by default
    CURLOPT_COOKIELIST: Added "RELOAD" command
    build: Added WinIDN build configuration options to Visual Studio projects
    ssh: improve key file search
    SSL: public key pinning. Use CURLOPT_PINNEDPUBLICKEY and --pinnedpubkey
    vtls: remove QsoSSL support, use gskit!
    mk-ca-bundle: added SHA-384 signature algorithm
    docs: added many examples for libcurl opts and other doc improvements
    build: Added VC ssh2 target to main Makefile
    MinGW: Added support to build with nghttp2
    NetWare: Added support to build with nghttp2
    build: added Watcom support to build with WinSSL
    build: Added optional specific version generation of VC project files
    ... and a bunch of bugfixes
- refreshed libcurl-ocloexec.patch
- removed gpg-offline verification
- spec-cleaned curl.spec

OBS-URL: https://build.opensuse.org/request/show/261640
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=117

curl.spec

@@ -19,9 +19,8 @@
 %bcond_without openssl
 %bcond_with mozilla_nss
 %bcond_without testsuite
-
 Name:           curl
-Version:        7.38.0
+Version:        7.39.0
 Release:        0
 Summary:        A Tool for Transferring Data from URLs
 License:        BSD-3-Clause and MIT
@@ -31,38 +30,34 @@ Source:         http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2:        http://curl.haxx.se/download/%{name}-%{version}.tar.lzma.asc
 Source3:        baselibs.conf
 Source4:        %{name}.keyring
-Patch:          libcurl-ocloexec.patch
+Patch0:         libcurl-ocloexec.patch
 Patch1:         dont-mess-with-rpmoptflags.diff
 Patch3:         curl-secure-getenv.patch
-# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run one-shot check by "gpg-offline --verify --package=curl curl-*.asc".
-%if 0%{?VERIFY_SIG}
-BuildRequires:  gpg-offline
-%endif
+BuildRequires:  krb5-mini-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libssh2-devel
 BuildRequires:  libtool
 BuildRequires:  lzma
 BuildRequires:  openldap2-devel
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
+Requires:       libcurl4 = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with openssl}
 BuildRequires:  openssl-devel
 %endif
 %if %{with mozilla_nss}
 BuildRequires:  mozilla-nss-devel
 %endif
-BuildRequires:  krb5-mini-devel
-BuildRequires:  libssh2-devel
 #BuildRequires:  openssh
 %if 0%{?_with_stunnel:1}
 # used by the testsuite
 BuildRequires:  stunnel
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # bug437293
 %ifarch ppc64
 Obsoletes:      curl-64bit
 %endif
-Requires:       libcurl4 = %{version}
 
 %description
 Curl is a client to get documents and files from or send documents to a
@@ -94,11 +89,8 @@ DICT, TELNET, LDAP, or FILE). The command is designed to work without
 user interaction or any kind of interactivity.
 
 %prep
-%if 0%{?VERIFY_SIG}
-%gpg_verify %{S:2}
-%endif
 %setup -q
-%patch
+%patch0
 %patch1
 %patch3
 
@@ -106,7 +98,7 @@ user interaction or any kind of interactivity.
 # curl complains if macro definition is contained in CFLAGS
 # see m4/xc-val-flgs.m4
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS=$(echo $RPM_OPT_FLAGS | sed 's/-D_FORTIFY_SOURCE=2//')
+CFLAGS=$(echo %{optflags} | sed 's/-D_FORTIFY_SOURCE=2//')
 export CPPFLAGS CFLAGS
 autoreconf -fi
 # local hack to make curl-config --libs stop printing libraries it depends on
@@ -117,14 +109,14 @@ sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
 	--enable-ipv6 \
 %if %{with openssl}
 	--with-ssl \
-	--with-ca-path=/etc/ssl/certs/ \
+	--with-ca-path=%{_sysconfdir}/ssl/certs/ \
 %else
 	--without-ssl \
 %if %{with mozilla_nss}
 	--with-nss \
 %endif
 %endif
-	--with-gssapi=/usr/lib/mit \
+	--with-gssapi=%{_libexecdir}/mit \
 	--with-libssh2\
 	--enable-hidden-symbols \
 	--disable-static \
@@ -136,10 +128,9 @@ sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
 make %{?_smp_mflags}
 
 %if %{with testsuite}
-
 %check
 cd tests
-make
+make %{?_smp_mflags}
 # make sure the testsuite runs don't race on MP machines in autobuild
 if test -z "$BUILD_INCARNATION" -a -r /.buildenv; then
 	. /.buildenv
@@ -158,10 +149,10 @@ perl ./runtests.pl -a -b$base || {
 %endif
 
 %install
-%{makeinstall}
-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/
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+rm %{buildroot}%{_libdir}/libcurl.la
+install -d %{buildroot}%{_datadir}/aclocal
+install -m 644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/
 
 %post -n libcurl4 -p /sbin/ldconfig
 
@@ -172,7 +163,7 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/
 %doc README RELEASE-NOTES
 %doc docs/{BUGS,FAQ,FEATURES,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting}
 %doc lib/README.curl_off_t
-%{_prefix}/bin/curl
+%{_bindir}/curl
 %doc %{_mandir}/man1/curl.1%{ext_man}
 
 %files -n libcurl4
@@ -181,10 +172,10 @@ install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/
 
 %files -n libcurl-devel
 %defattr(-,root,root)
-%{_prefix}/bin/curl-config
-%{_prefix}/include/curl
-%dir %{_prefix}/share/aclocal
-%{_prefix}/share/aclocal/libcurl.m4
+%{_bindir}/curl-config
+%{_includedir}/curl
+%dir %{_datadir}/aclocal
+%{_datadir}/aclocal/libcurl.m4
 %{_libdir}/libcurl.so
 %{_libdir}/pkgconfig/libcurl.pc
 %{_mandir}/man1/curl-config.1%{ext_man}