diff --git a/expat-2.2.1.tar.bz2 b/expat-2.2.1.tar.bz2
deleted file mode 100644
index 59ef7f8..0000000
--- a/expat-2.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885
-size 405441
diff --git a/expat-2.2.5.tar.bz2 b/expat-2.2.5.tar.bz2
new file mode 100644
index 0000000..0d0b7d7
--- /dev/null
+++ b/expat-2.2.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
+size 510868
diff --git a/expat.changes b/expat.changes
index 3ba4528..92e9b58 100644
--- a/expat.changes
+++ b/expat.changes
@@ -1,3 +1,107 @@
+-------------------------------------------------------------------
+Thu Nov 16 10:22:18 UTC 2017 - jengelh@inai.de
+
+- Expand description of expat-devel.
+
+-------------------------------------------------------------------
+Thu Nov 16 09:04:25 UTC 2017 - mpluskal@suse.com
+
+- Do not generate manpages from docbook
+- Temporarily disable profiling due to bug in build system
+
+-------------------------------------------------------------------
+Wed Nov 8 20:01:31 UTC 2017 - aavindraa@gmail.com
+
+- Version update to 2.2.5 Tue October 31 2017
+ * Bug fixes:
+ - If the parser runs out of memory, make sure its internal
+ state reflects the memory it actually has, not the memory
+ it wanted to have.
+ - The default handler wasn't being called when it should for
+ a SYSTEM or PUBLIC doctype if an entity declaration handler
+ was registered.
+ - Fix a case of mistakenly reported parsing success where
+ XML_StopParser was called from an element handler
+ - Function XML_ErrorString was returning NULL rather than
+ a message for code XML_ERROR_INVALID_ARGUMENT
+ introduced with release 2.2.1
+ * Other changes:
+ - Add argument -N adding notation declarations
+ - various compiler-specific fixes
+ - Improve docbook2x-man detection
+- drop expat-docbook.patch
+ * fixed in 0f5186c7b8e503c669e332d944712de010b265f3
+- switch to github for release tarballs and website
+
+-------------------------------------------------------------------
+Thu Oct 26 09:53:50 UTC 2017 - pmonrealgonzalez@suse.com
+
+- Version update to 2.2.4 Sat August 19 2017
+ * Bug fixes:
+ #115 Fix copying of partial characters for UTF-8 input
+ * Other changes:
+ #109 Fix "make check" for non-x86 architectures that default
+ to unsigned type char (-128..127 rather than 0..255)
+ #109 coverage.sh: Cover -funsigned-char
+ Autotools: Introduce --without-xmlwf argument
+ #65 Autotools: Replace handwritten Makefile with GNU Automake
+ #43 CMake: Auto-detect high quality entropy extractors, add new
+ option USE_libbsd=ON to use arc4random_buf of libbsd
+ #74 CMake: Add -fno-strict-aliasing only where supported
+ #114 CMake: Always honor manually set BUILD_* options
+ #114 CMake: Compile man page if docbook2x-man is available, only
+ #117 Include file tests/xmltest.log.expected in source tarball
+ (required for "make run-xmltest")
+ #111 Fix some typos in documentation
+ Version info bumped from 7:5:6 to 7:6:6
+
+- Release 2.2.3 Wed August 2 2017
+ * Bug fixes:
+ #85 Fix a dangling pointer issue related to realloc
+ * Other changes:
+ #91 Linux: Allow getrandom to fail if nonblocking pool has not
+ yet been initialized and read /dev/urandom then, instead.
+ This is in line with what recent Python does.
+ #86 Check that a UTF-16 encoding in an XML declaration has the
+ right endianness
+#4 #5 #7 Recover correctly when some reallocations fail
+ Repair "./configure && make" for systems without any
+ provider of high quality entropy
+ and try reading /dev/urandom on those
+ Ensure that user-defined character encodings have converter
+ functions when they are needed
+ Fix mis-leading description of argument -c in xmlwf.1
+ Rely on macro HAVE_ARC4RANDOM_BUF (rather than __CloudABI__)
+ for CloudABI
+ #100 Fix use of SIPHASH_MAIN in siphash.h
+ #23 Test suite: Fix memory leaks
+ Version info bumped from 7:4:6 to 7:5:6
+
+- Release 2.2.2 Wed July 12 2017
+ * Security fixes:
+ #43 Protect against compilation without any source of high
+ quality entropy enabled, e.g. with CMake build system;
+ * [MOX-006] Fix non-NULL parser parameter validation in XML_Parse;
+ resulted in NULL dereference, previously;
+ * Bug fixes:
+ #69 Fix improper use of unsigned long long integer literals
+ * Other changes:
+ #73 Start requiring a C99 compiler
+ #49 Fix "==" Bashism in configure script
+ #58 Address compile warnings
+ #68 Fix "./buildconf.sh && ./configure" for some versions
+ of Dash for /bin/sh
+ #72 CMake: Ease use of Expat in context of a parent project
+ with multiple CMakeLists.txt files
+ #72 CMake: Resolve mistaken executable permissions
+ #76 Address compile warning with -DNDEBUG (not recommended!)
+ #77 Address compile warning about macro redefinition
+
+ * Added patch expat-docbook.patch to compile the man pages with
+ docbook-to-man
+
+ * Cleaned spec file with spec-cleaner
+
-------------------------------------------------------------------
Sat Oct 7 14:32:27 UTC 2017 - jayvdb@gmail.com
diff --git a/expat.spec b/expat.spec
index cf725e9..3ab7be2 100644
--- a/expat.spec
+++ b/expat.spec
@@ -16,20 +16,21 @@
#
+%global do_profiling 0
+%global unversion 2_2_5
Name: expat
-Version: 2.2.1
+Version: 2.2.5
Release: 0
Summary: XML Parser Toolkit
License: MIT
Group: Development/Libraries/C and C++
-Url: http://expat.sourceforge.net/
-Source0: http://downloads.sourceforge.net/project/expat/expat/%{version}/expat-%{version}.tar.bz2
+Url: http://libexpat.github.io
+Source0: https://github.com/libexpat/libexpat/releases/download/R_%{unversion}/expat-%{version}.tar.bz2
Source1: %{name}faq.html
Source2: baselibs.conf
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Expat is an XML parser library written in C. It is a stream-oriented
@@ -46,7 +47,7 @@ parser in which an application registers handlers for things the
parser might find in the XML document (like start tags).
%package -n libexpat-devel
-Summary: XML Parser Toolkit
+Summary: Development files for expat, an XML parser toolkit
Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libexpat1 = %{version}
@@ -68,11 +69,13 @@ rm -f examples/*.dsp
%build
%configure \
--disable-silent-rules \
+ --without-docbook \
+ --docdir="%{_docdir}/%{name}" \
--disable-static
%if 0%{?do_profiling}
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" LDFLAGS="%{optflags} %{cflags_profile_generate}" check
- make clean
+ make %{?_smp_mflags} clean
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
%else
make %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -89,18 +92,19 @@ make %{?_smp_mflags} check
%postun -n libexpat1 -p /sbin/ldconfig
%files
-%defattr(-, root, root)
-%doc COPYING Changes README examples expatfaq.html
+%{_docdir}/%{name}
+%doc COPYING README.md expatfaq.html
%doc doc/expat.png doc/reference.html doc/style.css doc/valid-xhtml10.png
+%doc examples/elements.c examples/outline.c examples/Makefile.am examples/Makefile.in
+%doc AUTHORS Changes
%{_mandir}/man?/*
%{_bindir}/xmlwf
%files -n libexpat1
-%defattr(-, root, root)
%{_libdir}/libexpat.so.*
%files -n libexpat-devel
-%defattr(-, root, root)
+
%{_includedir}/*
%{_libdir}/libexpat.so
%{_libdir}/pkgconfig/expat.pc
diff --git a/expatfaq.html b/expatfaq.html
index 2a701b0..af7555f 100644
--- a/expatfaq.html
+++ b/expatfaq.html
@@ -1,6 +1,12 @@
+
+
expat FAQ
@@ -9,14 +15,6 @@
Frequently Asked Questions about Expat
-Where can I get the latest version of expat?
-
-The latest version of expat 1.X is available from ftp://ftp.jclark.com/pub/xml/expat.zip. New versions of expat
-will be available from expat.sourceforge.net.
-
Where can I get help in using expat?
Try the xml-dev mailing list (subscribe by mailing to