From b6796a5f55f7497b30a5dc93694df720e1342834 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Tue, 3 Feb 2015 01:06:31 +1000
Subject: [PATCH] Spec cleanup

---
 .gitignore |  2 --
 curl.spec  | 65 +++++++++++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 30 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c861728..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-curl-7.28.0.tar.lzma
-curl-7.28.0.tar.lzma.asc
diff --git a/curl.spec b/curl.spec
index 1237d50..8a7833e 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,4 +1,4 @@
-%define major	4
+%define major 4
 %define libname %mklibname %{name} %{major}
 %define devname %mklibname %{name} -d
 %ifarch aarch64
@@ -16,15 +16,15 @@ Url:		http://curl.haxx.se
 Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Patch4:		%{name}-7.26.0-multilib.patch
 Patch6:		%{name}-7.26.0-do-not-build-examples.patch
-BuildRequires:	groff-base
+BuildRequires:	groff
 BuildRequires:	stunnel
 BuildRequires:	krb5-devel
 BuildRequires:	openldap-devel
-BuildRequires:	pkgconfig(openssl)
-BuildRequires:	pkgconfig(zlib)
+BuildRequires:	pkgconfig(libcares)
 BuildRequires:	pkgconfig(libidn)
 BuildRequires:	pkgconfig(libssh2)
-BuildRequires:	pkgconfig(libcares)
+BuildRequires:	pkgconfig(openssl)
+BuildRequires:	pkgconfig(zlib)
 Provides:	webfetch
 
 %description
@@ -37,6 +37,12 @@ authentication, ftp upload, HTTP post, file transfer resume and more.
 
 This version is compiled with SSL (https) support.
 
+%files
+%{_bindir}/curl
+%{_mandir}/man1/curl.1*
+
+#----------------------------------------------------------------------------
+
 %package -n %{libname}
 Summary:	A library of functions for file transfer
 Group:		Networking/Other
@@ -49,6 +55,11 @@ various protocols, including http and ftp.
 You should install this package if you plan to use any applications that
 use libcurl.
 
+%files -n %{libname}
+%{_libdir}/libcurl.so.%{major}*
+
+#----------------------------------------------------------------------------
+
 %package -n %{devname}
 Summary:	Header files and static libraries for libcurl
 Group:		Development/C
@@ -62,15 +73,35 @@ various protocols, including http and ftp.
 You should install this package if you wish to develop applications that
 use libcurl.
 
+%files -n %{devname}
+%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
+%{_includedir}/curl
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/aclocal/*.m4
+%{_mandir}/man1/curl-config.1*
+%{_mandir}/man3/*
+
+#----------------------------------------------------------------------------
+
 %package examples
 Summary:	Example files for %{name} development
 Group:		Development/C
-Requires:       %{name}-devel = %{EVRD}
+Requires:	%{name}-devel = %{EVRD}
 BuildArch:	noarch
 
 %description examples
 Example files for %{name} development.
 
+%files examples
+%doc docs/examples
+
+#----------------------------------------------------------------------------
+
 %prep
 %setup -q
 %apply_patches
@@ -126,25 +157,3 @@ find %{buildroot} -name ca-bundle.crt -exec rm -f '{}' \;
 # we don't package mk-ca-bundle so we don't need man for it
 rm -f %{buildroot}%{_mandir}/man1/mk-ca-bundle.1*
 
-%files
-%{_bindir}/curl
-%{_mandir}/man1/curl.1*
-
-%files -n %{libname}
-%{_libdir}/libcurl.so.%{major}*
-
-%files -n %{devname}
-%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
-%{_includedir}/curl
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/aclocal/*.m4
-%{_mandir}/man1/curl-config.1*
-%{_mandir}/man3/*
-
-%files examples
-%doc docs/examples