From 73fb2d7a9d3c810ea572e6c1d4ec938f6a86408b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Fri, 9 Feb 2018 14:22:44 +0100
Subject: [PATCH] cleanup spec

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 libxslt.spec | 112 ++++++++++++++++++++++++---------------------------
 1 file changed, 53 insertions(+), 59 deletions(-)

diff --git a/libxslt.spec b/libxslt.spec
index 74fffc5..a49fccc 100644
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -1,20 +1,23 @@
-Summary: Library providing the Gnome XSLT engine
-Name: libxslt
-Version: 1.1.30
-Release: 5%{?dist}%{?extra_release}
-License: MIT
-Group: Development/Libraries
-Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
-URL: http://xmlsoft.org/XSLT/
-BuildRequires: libxml2-devel >= 2.6.27
-BuildRequires: python2-devel
-BuildRequires: python2-libxml2
-BuildRequires: libgcrypt-devel
-BuildRequires: automake autoconf libtool
+Name:           libxslt
+Summary:        Library providing the Gnome XSLT engine
+Version:        1.1.30
+Release:        5%{?dist}
+
+License:        MIT
+URL:            http://xmlsoft.org/XSLT
+Source:         ftp://xmlsoft.org/XSLT/%{name}-%{version}.tar.gz
+
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  gcc
+BuildRequires:  %{_bindir}/libgcrypt-config
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.27
 
 # Fedora specific patches
-Patch0: multilib.patch
-Patch1: libxslt-1.1.26-utf8-docs.patch
+Patch0:         multilib.patch
+Patch1:         libxslt-1.1.26-utf8-docs.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1498539
 # https://git.gnome.org/browse/libxslt/commit/?id=76df4c960c7247d82bf1c26344e76236cb37a175
@@ -27,26 +30,26 @@ mechanism. To use it you need to have a version of libxml2 >= 2.6.27
 installed. The xsltproc command is a command line interface to the XSLT engine
 
 %package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: libxslt = %{version}-%{release}
-Requires: libgcrypt-devel
-
+Summary:        Development libraries and header files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libgcrypt-devel%{?_isa}
+Requires:       libgpgerror-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %package -n python2-libxslt
+Summary:        Python 2 bindings for %{name}
+BuildRequires:  python2-devel
+BuildRequires:  python2-libxml2
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       python2-libxml2
 %{?python_provide:%python_provide python2-libxslt}
 # Remove before F30
-Provides: %{name}-python = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-python < %{version}-%{release}
-Summary: Python bindings for the libxslt library
-Group: Development/Libraries
-Requires: libxslt = %{version}-%{release}
-Requires: python2-libxml2
+Provides:       %{name}-python = %{version}-%{release}
+Provides:       %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes:      %{name}-python < %{version}-%{release}
 
 %description -n python2-libxslt
 The libxslt-python package contains a module that permits applications
@@ -59,46 +62,36 @@ the XSLT transformation context are possible to extend the XSLT language
 with XPath functions written in Python.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1 -b .utf8
-%patch2 -p1 -b .xml_config
-# Now fix up the timestamps of patched docs files
-# ChangeLog needs to be retouched before gzip as well
-# since timestamp affects output
-touch -r ChangeLog.utf8 ChangeLog
-touch -r NEWS.utf8 NEWS
-
+%autosetup -p1
 chmod 644 python/tests/*
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+autoreconf -vfi
+%configure --disable-static --disable-silent-rules
+%make_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
+%make_install
+find %{buildroot} -name '*.la' -print -delete
 # multiarch crazyness on timestamp differences
-touch -m --reference=$RPM_BUILD_ROOT/%{_includedir}/libxslt/xslt.h $RPM_BUILD_ROOT/%{_bindir}/xslt-config
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-python}-%{version}
+touch -m --reference=%{buildroot}%{_includedir}/libxslt/xslt.h %{buildroot}%{_bindir}/xslt-config
+rm -vrf %{buildroot}%{_docdir}
 
 %check
-make tests
+%make_build tests
 
 %ldconfig_scriptlets
 
 %files
-%defattr(-, root, root,-)
-%doc AUTHORS ChangeLog NEWS README Copyright FEATURES
-%doc %{_mandir}/man1/xsltproc.1*
-%{_libdir}/lib*.so.*
-%{_libdir}/libxslt-plugins
+%license Copyright
+%doc AUTHORS ChangeLog NEWS README FEATURES
 %{_bindir}/xsltproc
+%{_libdir}/libxslt.so.*
+%{_libdir}/libexslt.so.*
+%{_libdir}/libxslt-plugins/
+%{_mandir}/man1/xsltproc.1*
 
 %files devel
-%defattr(-, root, root,-)
 %doc doc/libxslt-api.xml
 %doc doc/libxslt-refs.xml
 %doc doc/EXSLT/libexslt-api.xml
@@ -110,18 +103,19 @@ make tests
 %doc doc/tutorial
 %doc doc/tutorial2
 %doc doc/EXSLT
-%{_libdir}/lib*.so
-%{_libdir}/*.sh
+%{_libdir}/libxslt.so
+%{_libdir}/libexslt.so
+%{_libdir}/xsltConf.sh
 %{_datadir}/aclocal/libxslt.m4
-%{_includedir}/*
-%{_bindir}/xslt-config
+%{_includedir}/libxslt/
+%{_includedir}/libexslt/
 %{_libdir}/pkgconfig/libxslt.pc
 %{_libdir}/pkgconfig/libexslt.pc
+%{_bindir}/xslt-config
 
 %files -n python2-libxslt
-%defattr(-, root, root,-)
-%{python_sitearch}/libxslt.py*
-%{python_sitearch}/libxsltmod*
+%{python2_sitearch}/libxslt.py*
+%{python2_sitearch}/libxsltmod.so
 %doc python/libxsltclass.txt
 %doc python/tests/*.py
 %doc python/tests/*.xml