From 4ed2b583f676684e9114185733bb40f6314a2c2a Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Aug 15 2018 15:33:05 +0000 Subject: update to 2.2.6 --- diff --git a/.gitignore b/.gitignore index 8a17f27..c7f989b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ expat-2.0.1.tar.gz /expat-2.2.3.tar.gz /expat-2.2.4.tar.gz /expat-2.2.5.tar.gz +/expat-2.2.6.tar.gz diff --git a/expat-2.2.5-doc2man.patch b/expat-2.2.5-doc2man.patch deleted file mode 100644 index 59c7136..0000000 --- a/expat-2.2.5-doc2man.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -uap libexpat-R_2_2_5/expat/configure.ac.doc2man libexpat-R_2_2_5/expat/configure.ac ---- libexpat-R_2_2_5/expat/configure.ac.doc2man -+++ libexpat-R_2_2_5/expat/configure.ac -@@ -241,7 +241,7 @@ AS_IF([test "x$with_docbook" != xno], - [if test "x$with_docbook" != xcheck; then - AC_MSG_ERROR([Required program 'docbook2x-man' not found.])])]) - --AM_CONDITIONAL(WITH_DOCBOOK, [test x${DOCBOOK_TO_MAN} != x]) -+AM_CONDITIONAL(WITH_DOCBOOK, [test "x${DOCBOOK_TO_MAN}" != x]) - - AC_CONFIG_FILES([Makefile expat.pc]) - AC_CONFIG_FILES([ -diff -uap libexpat-R_2_2_5/expat/doc/Makefile.am.doc2man libexpat-R_2_2_5/expat/doc/Makefile.am ---- libexpat-R_2_2_5/expat/doc/Makefile.am.doc2man -+++ libexpat-R_2_2_5/expat/doc/Makefile.am -@@ -32,8 +32,9 @@ dist_man_MANS = xmlwf.1 - - xmlwf.1: xmlwf.xml - if WITH_DOCBOOK -+ -rm -f $@ - $(DOCBOOK_TO_MAN) $< -- mv XMLWF.1 $@ -+ test -f $@ || mv XMLWF.1 $@ - else - @echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2 - @false diff --git a/expat.spec b/expat.spec index 039f70b..d1c35a8 100644 --- a/expat.spec +++ b/expat.spec @@ -1,14 +1,13 @@ -%global unversion 2_2_5 +%global unversion 2_2_6 Summary: An XML parser library Name: expat Version: %(echo %{unversion} | sed 's/_/./g') -Release: 4%{?dist} +Release: 1%{?dist} Source: https://github.com/libexpat/libexpat/archive/R_%{unversion}.tar.gz#/expat-%{version}.tar.gz URL: https://libexpat.github.io/ License: MIT BuildRequires: autoconf, libtool, xmlto, gcc-c++ -Patch0: expat-2.2.5-doc2man.patch %description This is expat, the C library for parsing XML, written by James Clark. Expat @@ -36,7 +35,6 @@ Install it if you need to link statically with expat. %prep %setup -q -n libexpat-R_%{unversion}/expat -%patch0 -p2 -b .doc2man sed -i 's/install-data-hook/do-nothing-please/' lib/Makefile.am ./buildconf.sh @@ -74,6 +72,9 @@ make check %{_libdir}/lib*.a %changelog +* Wed Aug 15 2018 Joe Orton - 2.2.6-1 +- update to 2.2.6 + * Fri Jul 13 2018 Fedora Release Engineering - 2.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 043438b..c74cc49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (expat-2.2.5.tar.gz) = 61ce2a479521412e0c56c352106c4adfb61a6bedb883921aba3ebccc29311ddd192646ac2c51b41572728d4de6ab4cb60a1dbc71515d742a80a8b59d89ca74d6 +SHA512 (expat-2.2.6.tar.gz) = 727fbd24041c9af71b32353448583a6d8b38ddf93b10c97510e847939c2ad2be9b40ff6e6e27b725bff277982c2fc96c75f19c4a3ac4a246133eb62870c963d8