[pacman/f20] Fix for #1176244 and packaging updates

[Zbigniew Jędrzejewski-Szmek]

commit d249090b2bc105ef4d4805920776956ad5d270a9
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Jan 7 08:43:36 2015 -0500

    Fix for #1176244 and  packaging updates

 pacman.spec |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/pacman.spec b/pacman.spec
index 2d6cdc1..d2eab8f 100644
--- a/pacman.spec
+++ b/pacman.spec
@@ -8,9 +8,12 @@
 %global libmajor 8
 %global libversion %{libmajor}.0.2
 
+# Use the same directory of the main package for subpackage licence and docs
+%global _docdir_fmt %{name}
+
 Name:           pacman
 Version:        4.1.2
-Release:        1.%{gitdate}git%{gitversion}%{?dist}
+Release:        4.%{gitdate}git%{gitversion}%{?dist}
 Source:         https://projects.archlinux.org/%{name}.git/snapshot/%{name}-%{gitversion}.tar.gz
 Url:            https://www.archlinux.org/pacman
 License:        GPLv2+
@@ -29,6 +32,7 @@ BuildRequires:  gpgme-devel
 BuildRequires:  openssl-devel
 BuildRequires:  libcurl-devel
 Requires:       %{name}-filesystem = %{version}-%{release}
+Requires:       bsdtar
 
 %description
 Pacman is the package manager used by the Arch distribution. It is a
@@ -76,7 +80,7 @@ packages.
 
 %build
 ./autogen.sh
-%configure --enable-debug --enable-doxygen
+%configure --enable-debug --enable-doxygen CFLAGS=-Wno-error
 make %{?_smp_mflags}
 
 %install
@@ -132,12 +136,13 @@ EOF
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
-%doc COPYING NEWS
+%license COPYING
+%doc NEWS
 
 %files -n libalpm -f libalpm.lang
 %{_libdir}/libalpm.so.%{libversion}
 %{_libdir}/libalpm.so.%{libmajor}
-%doc COPYING
+%license COPYING
 
 %files -n libalpm-devel
 %{_includedir}/alpm_list.h
@@ -145,7 +150,8 @@ EOF
 %{_libdir}/pkgconfig/libalpm.pc
 %{_libdir}/libalpm.so
 %{_mandir}/man3/*
-%doc COPYING HACKING
+%license COPYING
+%doc HACKING
 
 %files filesystem
 %dir %{_sysconfdir}/pacman.d
@@ -153,6 +159,10 @@ EOF
 
 
 %changelog
+* Wed Jan 07 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 4.1.2-4.20130626git28cb22e
+- Require bsdtar (#1176244)
+- Use %license and a single directory for documentation
+
 * Thu Aug 22 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 4.1.2-1.20130626git28cb22e
 - Build from git snapshot.
 - Include /etc/pacman.d/mirrorlist.