- don't include macros.python, it's obsolete

[packages/libxml2.git] / libxml2.spec

diff --git a/libxml2.spec b/libxml2.spec
index 69d7a7e1897dfb8df8d7186ae5039782659b01be..74a5dabe4c5865e2c6032b6db54f6f62fa45f710 100644 (file)
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,20 +1,21 @@
 #
 # Conditional build:
 %bcond_without python  # don't build python module
+%bcond_without static_libs # don't build static libraries
 #
-%{?with_python:%include        /usr/lib/rpm/macros.python}
 Summary:       libXML library
 Summary(es):   Biblioteca libXML version 2
-Summary(pl):   Biblioteka libxml2
+Summary(pl):   Biblioteka libXML wersja 2
 Summary(pt_BR):        Biblioteca libXML versão 2
 Name:          libxml2
-Version:       2.6.6
-Release:       1
+Version:       2.6.27
+Release:       2
 Epoch:         1
 License:       MIT
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 4aa5c05a92302b50d9a87e7c84527a8e
+#Source0:      http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/%{name}-%{version}.tar.bz2
+Source0:       ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
+# Source0-md5: f5806f5059ef7bd4d3fcf36cf116d1ef
 Patch0:                %{name}-amfix.patch
 Patch1:                %{name}-man_fixes.patch
 Patch2:                %{name}-open.gz.patch
@@ -29,6 +30,7 @@ BuildRequires:        ncurses-devel
 BuildRequires: readline-devel >= 4.2
 %{?with_python:BuildRequires:  rpm-pythonprov}
 BuildRequires: zlib-devel
+Obsoletes:     xml-common
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +40,7 @@ This library allows you to manipulate XML files.
 Esta biblioteca permite manipulación de archivos XML.
 
 %description -l pl
-Biblioteka libxml2 umo¿liwia manipulowaie zawarto¶ci± plików XML.
+Biblioteka libxml2 umo¿liwia manipulowanie zawarto¶ci± plików XML.
 
 %description -l pt_BR
 Esta biblioteca permite a manipulação de arquivos XML.
@@ -49,7 +51,7 @@ Summary(es):  Biblioteca y archivos de inclusi
 Summary(pl):   Pliki nag³ówkowe i inne do libxml2
 Summary(pt_BR):        Bibliotecas e arquivos de inclusão para desenvolvimento de aplicações que usem a biblioteca libxml
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      zlib-devel
 
 %description devel
@@ -73,7 +75,7 @@ Summary(es):  Static libraries to develop libxml applications
 Summary(pl):   Biblioteka statyczna libxml2
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento de aplicações que usem a biblioteca libxml
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static libxml2 libraries.
@@ -90,21 +92,21 @@ biblioteca libxml.
 
 %package progs
 Summary:       XML files parser
-Summary(pl):   Parser plików XML
+Summary(pl):   Analizator sk³adniowy plików XML
 Group:         Applications/Text
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description progs
 XML files parser.
 
 %description progs -l pl
-Parser plików XML.
+Analizator sk³adniowy plików XML.
 
 %package -n python-%{name}
 Summary:       Python support for libxml2
 Summary(pl):   Modu³y jêzyka Python dla biblioteki libxml2
 Group:         Libraries/Python
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 %pyrequires_eq python-libs
 Obsoletes:     libxml2-python
 
@@ -127,7 +129,9 @@ Modu
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{!?with_static_libs:--enable-static=no}
+
 %{__make}
 
 %install
@@ -150,10 +154,14 @@ mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}-python-%{version}/examples/* \
 
 # move html doc to -devel package
 install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html \
+mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html \
        $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
+# deal with gtk-doc files
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+mv -f $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir}
+
 # install catalog file
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/xml
 LD_LIBRARY_PATH=.libs ./xmlcatalog --create \
@@ -169,8 +177,8 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{py,la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -179,7 +187,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %dir %{_sysconfdir}/xml
-%config(noreplace) %verify(not mtime md5) %{_sysconfdir}/xml/catalog
+%config(noreplace) %verify(not md5 mtime) %{_sysconfdir}/xml/catalog
 
 %files devel
 %defattr(644,root,root,755)
@@ -192,10 +200,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libxml2
 %{_mandir}/man1/xml2-config.1*
 %{_examplesdir}/%{name}-devel-%{version}
+%{_gtkdocdir}/libxml2
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+%endif
 
 %files progs
 %defattr(644,root,root,755)