From ff7be9cb3366daff5eaefc1d8a0c7b04eda78e03 Mon Sep 17 00:00:00 2001
From: paragn <paragn@fedoraproject.org>
Date: Thu, 21 Oct 2010 11:17:37 +0530
Subject: [PATCH] - Merge-review cleanup (#226088)

---
 libxslt.spec | 88 +++++++++++++++++++++++-----------------------------
 1 file changed, 39 insertions(+), 49 deletions(-)

diff --git a/libxslt.spec b/libxslt.spec
index 0d9d2db..4075450 100644
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -1,19 +1,17 @@
 Summary: Library providing the Gnome XSLT engine
 Name: libxslt
 Version: 1.1.26
-Release: 3%{?dist}%{?extra_release}
+Release: 4%{?dist}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
-Requires: libxml2 >= 2.6.27
-BuildRequires: libxml2-devel >= 2.6.27
-BuildRequires: python python-devel
+BuildRequires: libxml2-devel
+BuildRequires: python2-devel
 BuildRequires: libxml2-python
 BuildRequires: libgcrypt-devel
-Prefix: %{_prefix}
-Docdir: %{_docdir}
+
+# Fedora specific patch
 Patch0: multilib.patch
 
 %description
@@ -23,25 +21,19 @@ 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: Libraries, includes, etc. to embed the Gnome XSLT engine
+Summary: Development files for %{name}
 Group: Development/Libraries
 Requires: libxslt = %{version}-%{release}
-Requires: libxml2-devel >= 2.6.27
-Requires: libgcrypt-devel
-Requires: pkgconfig
 
 %description devel
-This C library allows to transform XML files into other XML files
-(or HTML, text, ...) using the standard XSLT stylesheet transformation
-mechanism. To use it you need to have a version of libxml2 >= 2.6.27
-installed.
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
 
 %package python
 Summary: Python bindings for the libxslt library
 Group: Development/Libraries
 Requires: libxslt = %{version}-%{release}
-Requires: libxml2 >= 2.6.27
-Requires: libxml2-python >= 2.6.27
+Requires: libxml2-python
 
 %description python
 The libxslt-python package contains a module that permits applications
@@ -57,46 +49,44 @@ with XPath functions written in Python.
 %setup -q
 %patch0 -p1
 
+# Convert to utf-8
+for file in NEWS ChangeLog doc/tutorial2/libxslt_pipes.xml; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
+chmod 644 python/tests/*
+
 %build
 %configure --disable-static
-make
+make %{?_smp_mflags}
 gzip -9 ChangeLog
 
 %install
-rm -fr %{buildroot}
-
-%makeinstall
-
-rm -fr $RPM_BUILD_ROOT%{_libdir}/*.la \
-       $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/libxsltmod*a
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # multiarch crazyness on timestamp differences
-touch -m --reference=$RPM_BUILD_ROOT/%{prefix}/include/libxslt/xslt.h $RPM_BUILD_ROOT/%{prefix}/bin/xslt-config
+touch -m --reference=$RPM_BUILD_ROOT/%{_includedir}/libxslt/xslt.h $RPM_BUILD_ROOT/%{_bindir}/xslt-config
 
-%clean
-rm -fr %{buildroot}
+%check 
+make tests
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
-
-%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO FEATURES
-%doc doc/*.html doc/html doc/tutorial doc/tutorial2 doc/*.gif
-%doc doc/EXSLT
+%defattr(-, root, root,-)
+%doc AUTHORS ChangeLog.gz NEWS README Copyright FEATURES
 %doc %{_mandir}/man1/xsltproc.1*
 %{_libdir}/lib*.so.*
 %{_libdir}/libxslt-plugins
-%{prefix}/bin/xsltproc
+%{_bindir}/xsltproc
 
 %files devel
-%defattr(-, root, root)
-
-%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO FEATURES
+%defattr(-, root, root,-)
 %doc doc/libxslt-api.xml
 %doc doc/libxslt-refs.xml
 %doc doc/EXSLT/libexslt-api.xml
@@ -110,25 +100,25 @@ rm -fr %{buildroot}
 %doc doc/EXSLT
 %{_libdir}/lib*.so
 %{_libdir}/*.sh
-%{prefix}/share/aclocal/libxslt.m4
-%{prefix}/include/*
-%{prefix}/bin/xslt-config
+%{_datadir}/aclocal/libxslt.m4
+%{_includedir}/*
+%{_bindir}/xslt-config
 %{_libdir}/pkgconfig/libxslt.pc
 %{_libdir}/pkgconfig/libexslt.pc
 
 %files python
-%defattr(-, root, root)
-
-%doc AUTHORS ChangeLog.gz NEWS README Copyright FEATURES
-%{_libdir}/python*/site-packages/libxslt.py*
-%{_libdir}/python*/site-packages/libxsltmod*
-%doc python/TODO
+%defattr(-, root, root,-)
+%{python_sitearch}/libxslt.py*
+%{python_sitearch}/libxsltmod*
 %doc python/libxsltclass.txt
 %doc python/tests/*.py
 %doc python/tests/*.xml
 %doc python/tests/*.xsl
 
 %changelog
+* Tue Oct 05 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.1.26-4
+- Merge-review cleanup (#226088)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.1.26-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild