- rel 4; patch obsolete

[packages/expat.git] / expat.spec

diff --git a/expat.spec b/expat.spec
index 94c4123db7d5dc73436c896196f527f3264e51c7..63285515da2304eb252da7f01aa73b18e1b2ce17 100644 (file)
--- a/expat.spec
+++ b/expat.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without static_libs     # don't build static library
+
 Summary:       XML 1.0 parser
 Summary(es.UTF-8):     Parser de XML 1.0
 Summary(pl.UTF-8):     Analizator składni XML-a 1.0
@@ -5,18 +9,16 @@ Summary(pt_BR.UTF-8): Biblioteca XML expat
 Summary(ru.UTF-8):     Переносимая библиотека разбора XML (expat)
 Summary(uk.UTF-8):     Переносима бібліотека розбору XML (expat)
 Name:          expat
-Version:       2.0.0
-Release:       3
+Version:       2.2.0
+Release:       4
 Epoch:         1
 License:       Thai Open Source Software Center Ltd (distributable)
 Group:         Applications/Publishing/XML
-Source0:       http://dl.sourceforge.net/expat/%{name}-%{version}.tar.gz
-# Source0-md5: d945df7f1c0868c5c73cf66ba9596f3f
+Source0:       http://downloads.sourceforge.net/expat/%{name}-%{version}.tar.bz2
+# Source0-md5: 2f47841c829facb346eb6e3fab5212e2
 Patch0:                %{name}-ac_fixes.patch
-Patch1:                %{name}-am18.patch
-Patch2:                %{name}-soname.patch
-URL:           http://expat.sourceforge.net/
-BuildRequires: autoconf >= 2.52
+URL:           http://www.libexpat.org/
+BuildRequires: autoconf >= 2.58
 BuildRequires: automake
 BuildRequires: libtool
 Obsoletes:     libexpat1_95
@@ -27,8 +29,8 @@ Expat is an XML parser written in C. It aims to be fully conforming.
 It is currently not a validating XML parser.
 
 %description -l es.UTF-8
-Expat es un parser de XML escrito en C. Pretende conformarse totalmente
-al estándar. Actualmente no es un parser XML validante.
+Expat es un parser de XML escrito en C. Pretende conformarse
+totalmente al estándar. Actualmente no es un parser XML validante.
 
 %description -l pl.UTF-8
 Expat to napisany w języku C analizator składni XML-a. Dąży do pełnej
@@ -111,18 +113,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
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
-%configure
+%configure \
+       %{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
@@ -132,7 +147,10 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_aclocaldir}
-install conftools/expat.m4 $RPM_BUILD_ROOT%{_aclocaldir}
+cp -p conftools/expat.m4 $RPM_BUILD_ROOT%{_aclocaldir}
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -143,18 +161,26 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING Changes README
-%attr(755,root,root) %{_bindir}/xmlwf
-%attr(755,root,root) %{_libdir}/libexpat.so.*.*
-%{_mandir}/man1/xmlwf.1*
+%attr(755,root,root) %{_libdir}/libexpat.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libexpat.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/{reference.html,style.css}
+%doc doc/{reference.html,style.css,*.png}
 %attr(755,root,root) %{_libdir}/libexpat.so
 %{_libdir}/libexpat.la
 %{_includedir}/expat*.h
 %{_aclocaldir}/expat.m4
+%{_pkgconfigdir}/expat.pc
+%{_examplesdir}/%{name}-%{version}
 
+%if %{with static_libs}
 %files static
 %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*