- updated to 2.2.7 (possible DoS fix)

- removed obsolete ac_fixes patch

diff --git a/expat-ac_fixes.patch b/expat-ac_fixes.patch
deleted file mode 100644 (file)
index 1534296..0000000
--- a/expat-ac_fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- expat-2.1.1/configure.ac~  2012-07-28 10:41:03.000000000 +0300
-+++ expat-2.1.1/configure.ac   2012-07-28 10:41:41.511402972 +0300
-@@ -51,8 +51,6 @@
- 
- AC_CONFIG_HEADER(expat_config.h)
- 
--sinclude(conftools/ac_c_bigendian_cross.m4)
--
- AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
- 
-@@ -83,9 +80,7 @@
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- 
--dnl Note: Avoid using AC_C_BIGENDIAN because it does not
--dnl work in a cross compile.
--AC_C_BIGENDIAN_CROSS
-+AC_C_BIGENDIAN
- 
- AC_C_CONST
- AC_TYPE_SIZE_T

diff --git a/expat.spec b/expat.spec
index 98802f023e43fd600e4e71e4453b399e093e4b0e..ae32d5c70994f0f4a63e8a79c60dfedc4e5e1ba7 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -9,19 +9,21 @@ Summary(pt_BR.UTF-8): Biblioteca XML expat
 Summary(ru.UTF-8):     Переносимая библиотека разбора XML (expat)
 Summary(uk.UTF-8):     Переносима бібліотека розбору XML (expat)
 Name:          expat
-Version:       2.2.6
+Version:       2.2.7
 Release:       1
 Epoch:         1
 License:       MIT
 Group:         Applications/Publishing/XML
-Source0:       http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.bz2
-# Source0-md5: ca047ae951b40020ac831c28859161b2
-Patch0:                %{name}-ac_fixes.patch
+Source0:       http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.xz
+# Source0-md5: 3659bc0938db78815b5f5a9c24d732aa
 URL:           http://www.libexpat.org/
-BuildRequires: autoconf >= 2.58
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
 BuildRequires: docbook2X
-BuildRequires: libtool
+BuildRequires: gcc >= 5:3.2
+BuildRequires: libtool >= 2:2.4
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Obsoletes:     libexpat1_95
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -130,13 +132,12 @@ Programy narzędziowe do biblioteki Expat:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        DOCBOOK_TO_MAN=docbook2X2man \