up to 2.1.0

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

diff --git a/expat-2.0.1-fix_bug_1990430.patch b/expat-2.0.1-fix_bug_1990430.patch
deleted file mode 100644 (file)
index 17dc166..0000000
--- a/expat-2.0.1-fix_bug_1990430.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmltok_impl.c?view=log (1.13 -> 1.15)
-http://svn.python.org/view?view=rev&revision=74429
-
---- lib/xmltok_impl.c
-+++ lib/xmltok_impl.c
-@@ -1744,7 +1744,7 @@
-                        const char *end,
-                        POSITION *pos)
- {
--  while (ptr != end) {
-+  while (ptr < end) {
-     switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
-     case BT_LEAD ## n: \

diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
index ebc5208bab3bfd4599b885cc60cf75d8e2930fd6..0a36e887033cd6bd8c7e1fffee6d3ca66a055207 100644 (file)
--- 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@libexpat.org)
-+AC_INIT(expat, 2.0.0, expat-bugs@libexpat.org)
++AC_INIT(expat, 2.1.0, expat-bugs@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-am18.patch b/expat-am18.patch
deleted file mode 100644 (file)
index 3994a50..0000000
--- a/expat-am18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- expat-2.0.0/conftools/expat.m4.orig        2001-11-09 05:55:33.000000000 +0100
-+++ expat-2.0.0/conftools/expat.m4     2006-01-15 15:08:05.610539500 +0100
-@@ -7,7 +7,7 @@
- dnl In addition, an Automake conditional EXPAT_INSTALLED is set accordingly.
- dnl This is necessary to adapt a whole lot of packages that have expat
- dnl bundled as a static library.
--AC_DEFUN(AM_WITH_EXPAT,
-+AC_DEFUN([AM_WITH_EXPAT],
- [ AC_ARG_WITH(expat,
-             [  --with-expat=PREFIX     Use system Expat library],
-             , with_expat=no)

diff --git a/expat-soname.patch b/expat-soname.patch
deleted file mode 100644 (file)
index 8fd504c..0000000
--- a/expat-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- expat-2.0.1/configure.in.orig      2006-04-18 23:08:39.531073000 +0200
-+++ expat-2.0.1/configure.in   2006-04-18 23:18:45.256928500 +0200
-@@ -46,7 +46,7 @@
- 
- LIBCURRENT=6
- LIBREVISION=2
--LIBAGE=5
-+LIBAGE=6
- 
- AC_CONFIG_HEADER(expat_config.h)
- 

diff --git a/expat.spec b/expat.spec
index bbe070dd9b85f8ccdfe8184df18058d9883995a0..a20c656a956e7464e912b1d225df1f053acf41ff 100644 (file)
--- 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}