From 073b6e1e5e31c97dcbc88dd6ce3890e341fe6319 Mon Sep 17 00:00:00 2001
From: Ralf Corsépius <corsepiu@fedoraproject.org>
Date: Mar 16 2016 03:45:17 +0000
Subject: Rework doc installation (F24FTBFS, RHBZ#1307712).


- Modernize spec.
- Add %license.

---

diff --git a/libHX.spec b/libHX.spec
index 4ea3cba..119e613 100644
--- a/libHX.spec
+++ b/libHX.spec
@@ -1,8 +1,6 @@
-%global _hardened_build 1
-
 Name:           libHX
 Version:        3.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Useful collection of routines for C and C++ programming
 
 Group:          System Environment/Libraries
@@ -11,7 +9,6 @@ URL:            http://sourceforge.net/projects/libhx/
 Source0:        http://downloads.sourceforge.net/libhx/libHX-%{version}.tar.xz
 Source1:        http://downloads.sourceforge.net/libhx/libHX-%{version}.tar.asc
 Source2:        gpgkey-B56B8B9D9915AA8796EDC013DFFF2CDB19FC338D.gpg
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl gcc-c++
 # For source verification with gpgv
@@ -35,7 +32,6 @@ code) a developer has to spend for otherwise implementing such.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -48,22 +44,24 @@ xzcat %{SOURCE0} | gpgv --quiet --keyring %{SOURCE2} %{SOURCE1} -
 
 
 %build
-%configure --disable-static --with-pkgconfigdir=%{_libdir}/pkgconfig --docdir=%{_pkgdocdir}
-make %{?_smp_mflags} V=verbose
+# Without --docdir=.. package installs docs into ../libhx
+%configure --disable-static --disable-silent-rules  \
+  --with-pkgconfigdir=%{_libdir}/pkgconfig \
+  --docdir=%{_pkgdocdir}
+make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-%make_install V=1
+%make_install
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# :TODO: include the documentation more cleanly
-rm doc/Makefile*
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+# Install additional docs
+install -m 644 README.txt \
+  doc/api.txt \
+  doc/assorted.txt \
+  doc/changelog.txt \
+  doc/ux-*.txt \
+  $RPM_BUILD_ROOT%{_pkgdocdir}
 
 
 %post -p /sbin/ldconfig
@@ -72,16 +70,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
-%doc LICENSE.LGPL2 LICENSE.LGPL3 LICENSE.GPL3
-/%{_libdir}/libHX_rtcheck.so
-/%{_libdir}/libHX.so.28
-/%{_libdir}/libHX.so.28.3.0
+%license LICENSE.LGPL2 LICENSE.LGPL3 LICENSE.GPL3
+%{_libdir}/libHX_rtcheck.so
+%{_libdir}/libHX.so.28
+%{_libdir}/libHX.so.28.3.0
 
 
 %files devel
-%defattr(-,root,root,-)
-%doc doc/* README.txt
+%{_pkgdocdir}
+
 %dir %{_includedir}/libHX
 %{_includedir}/libHX.h
 %{_includedir}/libHX/ctype_helper.h
@@ -102,6 +99,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 16 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.22-4
+- Rework doc installation (F24FTBFS, RHBZ#1307712).
+- Modernize spec.
+- Add %%license.
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.22-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild