[packages/expat] up to 2.1.0

[glen]

commit c645eb57cac5b8c9a6dfa0a45d864e366a88661c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jul 28 10:47:50 2012 +0300

    up to 2.1.0
    
    what to do with the hacked soname? can we keep upstream? or should still
    increase ours?

 expat-2.0.1-fix_bug_1990430.patch | 14 --------------
 expat-ac_fixes.patch              | 12 +++++-------
 expat-am18.patch                  | 11 -----------
 expat-soname.patch                | 11 -----------
 expat.spec                        | 24 +++++-------------------
 5 files changed, 10 insertions(+), 62 deletions(-)
---
diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
index ebc5208..0a36e88 100644
--- a/expat-ac_fixes.patch
+++ b/expat-ac_fixes.patch
@@ -1,20 +1,18 @@
-diff -urN expat-2.0.0.org/configure.in expat-2.0.0/configure.in
---- expat-2.0.0.org/configure.in	2006-01-11 02:10:46.000000000 +0100
-+++ expat-2.0.0/configure.in	2006-04-09 18:08:18.483504500 +0200
+--- expat-2.1.0/configure.in~	2012-07-28 10:41:03.000000000 +0300
++++ expat-2.1.0/configure.in	2012-07-28 10:41:41.511402972 +0300
 @@ -26,7 +26,7 @@
  define([expat_version], ifdef([__gnu__],
                                [esyscmd(conftools/get-version.sh lib/expat.h)],
-                               [2.0.x]))
+                               [2.1.x]))
 -AC_INIT(expat, expat_version, expat-bugs at libexpat.org)
-+AC_INIT(expat, 2.0.0, expat-bugs at libexpat.org)
++AC_INIT(expat, 2.1.0, expat-bugs at libexpat.org)
  undefine([expat_version])
  
  AC_CONFIG_SRCDIR(Makefile.in)
-@@ -50,9 +50,6 @@
+@@ -51,8 +51,6 @@
  
  AC_CONFIG_HEADER(expat_config.h)
  
--sinclude(conftools/libtool.m4)
 -sinclude(conftools/ac_c_bigendian_cross.m4)
 -
  AC_LIBTOOL_WIN32_DLL
diff --git a/expat.spec b/expat.spec
index bbe070d..a20c656 100644
--- a/expat.spec
+++ b/expat.spec
@@ -9,27 +9,19 @@ Summary(pt_BR.UTF-8):	Biblioteca XML expat
 Summary(ru.UTF-8):	Переносимая библиотека разбора XML (expat)
 Summary(uk.UTF-8):	Переносима бібліотека розбору XML (expat)
 Name:		expat
-Version:	2.0.1
-Release:	5
+Version:	2.1.0
+Release:	0.1
 Epoch:		1
 License:	Thai Open Source Software Center Ltd (distributable)
 Group:		Applications/Publishing/XML
 Source0:	http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.gz
-# Source0-md5:	ee8b492592568805593f81f8cdf2a04c
+# Source0-md5:	dd7dab7a5fea97d2a6a43f511449b7cd
 Patch0:		%{name}-ac_fixes.patch
-Patch1:		%{name}-am18.patch
-Patch2:		%{name}-soname.patch
 Patch3:		%{name}-2.0.1-check_stopped_parser.patch
-Patch4:		%{name}-2.0.1-fix_bug_1990430.patch
 URL:		http://www.libexpat.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	libtool
-%ifarch %{x8664} ia64 ppc64 s390x sparc64
-Provides:	libexpat.so.1()(64bit)
-%else
-Provides:	libexpat.so.1
-%endif
 Obsoletes:	libexpat1_95
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -125,10 +117,7 @@ Bibliotecas estáticas para desenvolvimento com a biblioteca expat.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p0
-%patch4 -p0
 
 %build
 %{__libtoolize}
@@ -150,9 +139,6 @@ cp -p conftools/expat.m4 $RPM_BUILD_ROOT%{_aclocaldir}
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -p examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-# for compatibility with upstream/other distros
-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libexpat.so.*.*.* libexpat.so.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -165,8 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING Changes README
 %attr(755,root,root) %{_bindir}/xmlwf
 %attr(755,root,root) %{_libdir}/libexpat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libexpat.so.0
-%attr(755,root,root) %{_libdir}/libexpat.so.1
+%attr(755,root,root) %ghost %{_libdir}/libexpat.so.1
 %{_mandir}/man1/xmlwf.1*
 
 %files devel
@@ -176,6 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libexpat.la
 %{_includedir}/expat*.h
 %{_aclocaldir}/expat.m4
+%{_pkgconfigdir}/expat.pc
 %{_examplesdir}/%{name}-%{version}
 
 %if %{with static_libs}