Update docs, add more docs, use git tag

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  curl-7.74.0.tar.xz: 2bc01055f1a2212ef22f90f026f3a8f9c73d16c1
+  curl-7.74.0.tar.gz: 278957f92d2737a2bce8483d82c7b8f1abcc4091

curl-7.59.0-debug.patch

@@ -1,10 +1,21 @@
-diff -rupN curl-7.59.0.old/configure curl-7.59.0/configure
---- curl-7.59.0.old/configure	2018-03-12 23:47:13.000000000 +0100
-+++ curl-7.59.0/configure	2018-04-16 19:08:33.190743720 +0200
-@@ -16524,18 +16524,11 @@ $as_echo "yes" >&6; }
-     gccvhi=`echo $gccver | cut -d . -f1`
-     gccvlo=`echo $gccver | cut -d . -f2`
-     compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+From 3602ee9dcc74683f91fe4f9ca228aa17a6474403 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Wed, 31 Oct 2012 11:38:30 +0100
+Subject: [PATCH] prevent configure script from discarding -g in CFLAGS
+ (#496778)
+
+---
+ m4/curl-compilers.m4 | 26 ++++++--------------------
+ 1 file changed, 6 insertions(+), 20 deletions(-)
+
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index c64db4bc6..d115a4aed 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -106,18 +106,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_CLANG], [
+     clangvhi=`echo $clangver | cut -d . -f1`
+     clangvlo=`echo $clangver | cut -d . -f2`
+     compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
 -    flags_dbg_all="-g -g0 -g1 -g2 -g3"
 -    flags_dbg_all="$flags_dbg_all -ggdb"
 -    flags_dbg_all="$flags_dbg_all -gstabs"
@@ -16,17 +27,14 @@ diff -rupN curl-7.59.0.old/configure curl-7.59.0/configure
 +    flags_dbg_all=""
      flags_dbg_yes="-g"
      flags_dbg_off=""
--    flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast"
--    flags_opt_yes="-O2"
+-    flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
+-    flags_opt_yes="-Os"
 +    flags_opt_all=""
 +    flags_opt_yes=""
      flags_opt_off="-O0"
- 
-     OLDCPPFLAGS=$CPPFLAGS
-diff -rupN curl-7.59.0.old/m4/curl-compilers.m4 curl-7.59.0/m4/curl-compilers.m4
---- curl-7.59.0.old/m4/curl-compilers.m4	2018-02-15 09:29:27.000000000 +0100
-+++ curl-7.59.0/m4/curl-compilers.m4	2018-04-16 19:10:27.386145168 +0200
-@@ -157,18 +157,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
+   else
+     AC_MSG_RESULT([no])
+@@ -175,18 +168,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
      gccvhi=`echo $gccver | cut -d . -f1`
      gccvlo=`echo $gccver | cut -d . -f2`
      compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
@@ -48,3 +56,6 @@ diff -rupN curl-7.59.0.old/m4/curl-compilers.m4 curl-7.59.0/m4/curl-compilers.m4
      flags_opt_off="-O0"
      CURL_CHECK_DEF([_WIN32], [], [silent])
    else
+-- 
+1.7.1
+

curl.spec

@@ -15,6 +15,19 @@
 # script, this prevents if from regenerating after we have changed it.
 %define _disable_rebuild_configure 1
 
+%define _docs %{expand:
+%doc _docs/CHANGES \
+%doc _docs/COPYING \
+%doc _docs/README \
+%doc _docs/README.md \
+%doc _docs/RELEASE-NOTES \
+%doc _docs/SECURITY.md \
+%doc _docs/docs/FAQ \
+%doc _docs/docs/THANKS \
+%doc _docs/docs/KNOWN_BUGS \
+%doc _docs/docs/*.md
+}
+
 %if %{with libressl}
 %define ssl_list openssl libressl
 %else
@@ -34,11 +47,14 @@ Epoch:		1
 License:	BSD-like
 Group:		Networking/Other
 Url:		https://curl.haxx.se
-Source0:	https://curl.haxx.se/download/%{name}-%{version}.tar.xz
+# Release tarball does not have some useful docs
+#Source0:	https://curl.haxx.se/download/%{name}-%{version}.tar.xz
+Source0:	https://github.com/curl/curl/archive/curl-%(echo %{version} | sed -e 's,\.,_,g').tar.gz?/%{name}-%{version}.tar.gz
 Patch0:		%{name}-7.59.0-multilib.patch
 Patch2:		%{name}-7.59.0-debug.patch
 Patch3:		%{name}-libressl.patch
 BuildRequires:	groff
+BuildRequires:	rsync
 BuildRequires:	stunnel
 BuildRequires:	openldap-devel
 BuildRequires:	pkgconfig(krb5)
@@ -70,7 +86,7 @@ ftp upload, HTTP post, file transfer resume and more.
 This version is compiled with SSL (https) support.
 
 %files
-%doc COPYING
+%_docs
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
@@ -90,7 +106,7 @@ ftp upload, HTTP post, file transfer resume and more.
 This version is compiled with LibreSSL and is capable of GOST TLS.
 
 %files -n curl-libressl
-%doc COPYING
+%_docs
 %{_bindir}/curl-libressl
 %{_bindir}/curl-gost
 %endif
@@ -108,7 +124,7 @@ You should install this package if you plan to use any applications that
 use libcurl.
 
 %files -n %{libname}
-%doc COPYING
+%_docs
 %{_libdir}/libcurl.so.%{major}*
 
 #----------------------------------------------------------------------------
@@ -126,7 +142,7 @@ use libcurl.
 libcurl-libressl is linked with LibreSSL and is capable of GOST TLS.
 
 %files -n %{libname_libressl}
-%doc COPYING
+%_docs
 %{_libdir}/libcurl-libressl.so.%{major}*
 %endif
 #----------------------------------------------------------------------------
@@ -144,8 +160,7 @@ You should install this package if you wish to develop applications that
 use libcurl.
 
 %files -n %{devname}
-%doc docs/KNOWN_BUGS docs/FAQ CHANGES
-%doc docs/FEATURES docs/TODO docs/THANKS
+%_docs
 %{_bindir}/%{name}-config
 %{_libdir}/libcurl.so
 %{_includedir}/%{name}
@@ -172,7 +187,7 @@ You should install this package if you wish to develop applications that
 use libcurl linked with LibreSSL and capable of GOST.
 
 %files -n %{devname_libressl}
-%doc COPYING
+%_docs
 %{_includedir}/curl-libressl
 %{_libdir}/pkgconfig/libcurl-libressl.pc
 %{_libdir}/libcurl-libressl.so
@@ -195,7 +210,7 @@ Example files for %{name} development.
 #----------------------------------------------------------------------------
 
 %prep
-%setup -q
+%setup -q -n curl-curl-%(echo %{version} | sed -e 's,\.,_,g')
 cp libcurl.pc.in libcurl.pc.in.0
 %apply_patches
 # after Patch3 curl-libressl.patch
@@ -206,6 +221,13 @@ for i in %{ssl_list}; do
 	mkdir -p "$i"
 	cp -r $(ls -1v | grep -vE "$regexp") "$i"/
 done
+
+# %%_docs copy docs/*.md, remove odd ones
+rm -fv docs/README.md
+# build scripts seem to remove useful files, backup them
+mkdir -p _docs/
+rsync -av --relative --progress $(echo "%_docs" | sed -e 's,%doc,,g' -e 's,_docs/,,g') _docs/
+
 rm -fr $(ls -1v | grep -vE "${regexp}|docs|COPYING|CHANGES")
 
 %build