rpm/expat
SHA256
1
0
Fork 0
forked from pool/expat
Code Pull Requests Activity

Accepting request 1154595 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1154595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/expat?expand=0&rev=74
This commit is contained in:
Ana Guerrero 2024-03-05 17:46:48 +00:00 committed by Git OBS Bridge
commit fec4c11a08
7 changed files with 31 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
expat-2.6.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
size 483448

16
expat-2.6.0.tar.xz.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEy43nCpDPv2w79cxWliYqz/vTrsYFAmXCZZsACgkQliYqz/vT
rsZ6Mw//QulqmE4mQwy52wl17LQocguoQTCueHs8XFsmAQr9HFgKjaKaLn4Cqqay
eHJryqsjK3hjjWZWC5VFwFYIYnfEJ9Xiw4s0S1tPSOUiO2+GM5djuNGK3xlEI3aI
e+h8WwK1FvhlkjpBBbbXvbHTHKqOv6k+jt5yPr0gArYZ3aG0L+1Ihuv8RYdWfc9n
e31jwZSO5zjuP/tZvK5DzVdrmx2RgLKlrFtx+fA26VOn5zMRdBFcB7gCCYxTepzW
GF0H6DP3uNA3MAZT69gFVZ5TiDwEkxBh7Lez3aiE1b6oYy7cxQ4aJmaiPgDM5JLk
/Vu4nz0RuSLXIKePHXiAvDcbWmvlAPdvDsc0INh71RXF5avK3n1XVPfo6UcxZ7Hl
K0WxqRGgM+zRHrbwnCRm897EaET6jQ+G3hSUAyIPvnO9WILZrWi+4WHdfRpuaL3j
saOrawJOiGi7A4x21KkS83PVDq1l8RE+TNlRVYS3/Z/nqgeqwCKG04u8Tn8bnfYV
WRpFyDRL6yds+pFZUObbiHyzXt17O/eMEZEIrg2HBafYJ1fUcf1wjPy0H/wZEdvo
itNKn8ZQ1U0kwl4v/P/+RHkgKcAq4ES7AKIOpgLhi8ilr5GdpSuC3in3Ag/Oand5
jd9g//FbD2y3KXY60UPgs43Vw5mjBUG/BAn8i+75nf2FQQ2cCIM=
=oqBM
-----END PGP SIGNATURE-----

3
expat-2.6.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c00d2760ad12efef6e26efc8b363c8eb28eb8c8de719e46d5bb67b40ba904a3
size 484000

16
expat-2.6.1.tar.xz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEy43nCpDPv2w79cxWliYqz/vTrsYFAmXg6xUACgkQliYqz/vT
rsZWrw/9H+aLw9+Wk5KXrLSf0JxXoo11hQdHeMYbP1/1u/ne5phVehjRY1ebuZmh
425/adJQvcvGBoSpFcHQOJolgv1FRf3kZ30mXuibUVxuFTcqrebV4YXt/fL+FQ4W
he1aWO9V4MSoLudkt3bNAOYvPTQutLV1HqLmc3/YqzMDmF+Qd8lrk7qVP5tQX50C
yJC7E5gxlyZxlcXDRAeK96tzfG7eJMpmu11gyzSOdIlhUtmHpgBZ/nm8j5RNB+ih
nGSw//JVsOIgvijZNIjmNMe/BIid5Kw1g2ocQPYPyK0r+jqQ3Xqb4DhZaFJ4AIl0
UGDTQr7DMhbpL5XOXUvlpBRx9S9/KMpYK0Pabo0x7BLc1WGqw73U5kZ9kTd504Uu
72nWhd0DVJ3EnTvcReyrPDmhMy+4EF3BxyBU/zvBy72ajhgjf0DpXrmGVK46i8I5
C2VW+K54/fhbuLmcLqJ472Q0vEZ0hoAfI8ZCGe8bnDs4NlbyHUAcr3rwPxVpPcTs
ncHv7zrd0qEMtsJd6iUF9sGe/Sb6ZXq/0Ymvm19epr+RAGECtlA6lR0vv3Lm3nGo
P8Id7vF38uvVvD7QSk64qUlhMwtk8wApvl2KphqavQK8mEt9TkrTBsJ1MlS11W+9
4zXpgr4bGGVbKGVw/1x+n7iIMDtk8qVfMbCZVmgt4+Fj6KyuSac=
=EhJd
-----END PGP SIGNATURE-----

9
expat.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Mar 1 16:45:35 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 2.6.1:
* Expose billion laughs API with XML_DTD defined and XML_GE
undefined, regression from 2.6.0
* Make tests independent of CPU speed, and thus more robust
- drop libxml2-fix-xmlwf.1-handling.patch, upstream
-------------------------------------------------------------------
Tue Feb 20 12:21:17 UTC 2024 - David Anes <david.anes@suse.com>

16
expat.spec
View File

@ -16,9 +16,9 @@
#
%global unversion 2_6_0
%global unversion 2_6_1
Name: expat
Version: 2.6.0
Version: 2.6.1
Release: 0
Summary: XML Parser Toolkit
License: MIT
@ -31,13 +31,7 @@ Source3: %{name}faq.html
# https://www.gentoo.org/inside-gentoo/developers/index.html#sping
# https://github.com/libexpat/libexpat/issues/537#issuecomment-1003796884
Source4: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3176ef7db2367f1fca4f306b1f9b0e909af37285#/expat.keyring
# PATCH-UPSTREAM: Re-work handling of xmlwf.1
# https://github.com/libexpat/libexpat/pull/824
Patch0: libxml2-fix-xmlwf.1-handling.patch
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: c++_compiler
BuildRequires: pkgconfig
%description
@ -70,12 +64,8 @@ in libexpat.
%prep
%autosetup -p1
cp %{SOURCE3} .
# instead of autoreconf, it needs this to avoid breakign expat_config.h.in
./buildconf.sh
%build
%configure \
--disable-silent-rules \

85
libxml2-fix-xmlwf.1-handling.patch
View File

@ -1,85 +0,0 @@
From 0f6b39d2f513aae16c7377fc802c25ab81551c42 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Tue, 13 Feb 2024 19:42:04 +0100
Subject: [PATCH] Autotools: Re-work handling of xmlwf.1
File "doc/xmlwf.1" should not be cleaned when building with
"./configure --without-docbook", and re-compilation of the file
should take precedence over a pre-built copy where available.
Also, variable CLEANFILES can be used to simplify things a bit
in Makefile.am.
---
expat/configure.ac | 17 ++++++++++++++---
expat/doc/Makefile.am | 18 ++++++++----------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git expat/configure.ac expat/configure.ac
index a5d1ff931..8a9eddef0 100644
--- expat/configure.ac
+++ expat/configure.ac
@@ -357,11 +357,22 @@ AS_IF([test "x${DOCBOOK_TO_MAN}" != x -a "x$with_docbook" != xno],
page for xmlwf.])])])
dnl This will make sure that a release tarball shipping a pre-rendered xmlwf man page will
-dnl get it installed, independent of whether some flavor of docbook2man is available.
+dnl get it installed, when no working flavor of docbook2man is available (or wanted).
dnl This relies on file xmlwf.1 being at least as recent as its source file xmlwf.xml.
AS_IF([test -f "${srcdir}"/doc/xmlwf.1],
- [AM_CONDITIONAL(WITH_DOCBOOK, [true])],
- [AM_CONDITIONAL(WITH_DOCBOOK, [test "x${DOCBOOK_TO_MAN}" != x])])
+ [AM_CONDITIONAL(WITH_MANPAGE, [true])
+ AS_IF([test "x$with_docbook" = xno -o "x${DOCBOOK_TO_MAN}" = x],
+ [AM_CONDITIONAL(WITH_PREBUILT_MANPAGE, [true])
+ AM_CONDITIONAL(WITH_DISTRIBUTABLE_MANPAGE, [false])],
+ [AM_CONDITIONAL(WITH_PREBUILT_MANPAGE, [false])
+ AM_CONDITIONAL(WITH_DISTRIBUTABLE_MANPAGE, [true])])
+ ],
+ [AS_IF([test "x$with_docbook" != xno -a "x${DOCBOOK_TO_MAN}" != x],
+ [AM_CONDITIONAL(WITH_MANPAGE, [true])
+ AM_CONDITIONAL(WITH_DISTRIBUTABLE_MANPAGE, [true])],
+ [AM_CONDITIONAL(WITH_MANPAGE, [false])
+ AM_CONDITIONAL(WITH_DISTRIBUTABLE_MANPAGE, [false])])
+ AM_CONDITIONAL(WITH_PREBUILT_MANPAGE, [false])])
dnl Configure CMake file templates
dnl NOTE: The *_TRUE variables read here are Automake conditionals
diff --git expat/doc/Makefile.am expat/doc/Makefile.am
index c3a3ce59c..751365ebd 100644
--- expat/doc/Makefile.am
+++ expat/doc/Makefile.am
@@ -32,26 +32,24 @@
.PHONY: dist-hook # not inside conditional to avoid automake warning
-if WITH_DOCBOOK
+if WITH_MANPAGE
dist_man_MANS = xmlwf.1
xmlwf.1: xmlwf.xml
-rm -f $@
- $(DOCBOOK_TO_MAN) $<
+ test x$(DOCBOOK_TO_MAN) != x && $(DOCBOOK_TO_MAN) $<
test -f $@ || mv XMLWF.1 $@
-else
+endif
+
+if !WITH_DISTRIBUTABLE_MANPAGE
dist-hook:
@echo 'ERROR: Configure with --with-docbook for "make dist".' 1>&2
@false
endif
-# https://www.gnu.org/software/automake/manual/automake.html#What-Gets-Cleaned
-.PHONY: clean-local
-clean-local: clean-local-check
-
-.PHONY: clean-local-check
-clean-local-check:
- $(RM) xmlwf.1
+if !WITH_PREBUILT_MANPAGE
+CLEANFILES = xmlwf.1
+endif
EXTRA_DIST = \
ok.min.css \