- updated to 2.5.0 (fixes CVE-2022-40674 CVE-2022-43680)

[packages/expat.git] / expat.spec

diff --git a/expat.spec b/expat.spec
index a20c656a956e7464e912b1d225df1f053acf41ff..4507fd26adfe574cb86b9fb256f510f885bd9f5c 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without static_libs     # don't build static library
+%bcond_without static_libs     # static library
 
 Summary:       XML 1.0 parser
 Summary(es.UTF-8):     Parser de XML 1.0
@@ -9,20 +9,22 @@ Summary(pt_BR.UTF-8): Biblioteca XML expat
 Summary(ru.UTF-8):     Переносимая библиотека разбора XML (expat)
 Summary(uk.UTF-8):     Переносима бібліотека розбору XML (expat)
 Name:          expat
-Version:       2.1.0
-Release:       0.1
+Version:       2.5.0
+Release:       1
 Epoch:         1
-License:       Thai Open Source Software Center Ltd (distributable)
+License:       MIT
 Group:         Applications/Publishing/XML
-Source0:       http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.gz
-# Source0-md5: dd7dab7a5fea97d2a6a43f511449b7cd
-Patch0:                %{name}-ac_fixes.patch
-Patch3:                %{name}-2.0.1-check_stopped_parser.patch
+Source0:       https://downloads.sourceforge.net/expat/%{name}-%{version}.tar.xz
+# Source0-md5: ac6677b6d1b95d209ab697ce8b688704
 URL:           http://www.libexpat.org/
-BuildRequires: autoconf >= 2.52
+BuildRequires: autoconf >= 2.69
 BuildRequires: automake
-BuildRequires: libtool
-Obsoletes:     libexpat1_95
+BuildRequires: docbook2X
+BuildRequires: gcc >= 5:3.2
+BuildRequires: libtool >= 2:2.4
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Obsoletes:     libexpat1_95 < 2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,7 +64,7 @@ Summary(ru.UTF-8):    Хедеры и библиотека, необходимые
 Summary(uk.UTF-8):     Хедери та бібліотека, необхідні для програмування з expat
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     libexpat1_95-devel
+Obsoletes:     libexpat1_95-devel < 2
 
 %description devel
 Expat header files.
@@ -114,17 +116,31 @@ Bibliotecas estáticas para desenvolvimento com a biblioteca expat.
 Цей пакет містить статичну бібліотеку, необхідну для написання
 програм, що використовують libexpat.
 
+%package tools
+Summary:       Expat utilities (xmlwf)
+Summary(pl.UTF-8):     Programy narzędziowe do biblioteki Expat (xmlwf)
+Group:         Applications/Text
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description tools
+Expat utilities:
+- xmlwf: determines if an XML document is well-formed.
+
+%description tools -l pl.UTF-8
+Programy narzędziowe do biblioteki Expat:
+- xmlwf: sprawdza, czy dokument XML jest dobrze sformułowany.
+
 %prep
 %setup -q
-%patch0 -p1
-%patch3 -p0
 
 %build
 %{__libtoolize}
-%{__aclocal}
-%{__autoheader}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
+       DOCBOOK_TO_MAN=docbook2X2man \
        %{!?with_static_libs:--disable-static}
 %{__make}
 
@@ -148,20 +164,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING Changes README
-%attr(755,root,root) %{_bindir}/xmlwf
+%doc AUTHORS COPYING Changes README.md
 %attr(755,root,root) %{_libdir}/libexpat.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libexpat.so.1
-%{_mandir}/man1/xmlwf.1*
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/{reference.html,style.css,*.png}
+%doc doc/{reference.html,style.css}
 %attr(755,root,root) %{_libdir}/libexpat.so
 %{_libdir}/libexpat.la
 %{_includedir}/expat*.h
 %{_aclocaldir}/expat.m4
 %{_pkgconfigdir}/expat.pc
+%{_libdir}/cmake/expat-%{version}
 %{_examplesdir}/%{name}-%{version}
 
 %if %{with static_libs}
@@ -169,3 +184,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libexpat.a
 %endif
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xmlwf
+%{_mandir}/man1/xmlwf.1*