X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=libxml2.spec;h=74a5dabe4c5865e2c6032b6db54f6f62fa45f710;hb=96c3a28cd8760c0921b49c573755f5c8e3954c18;hp=ed20ac62c41575521cb57d397be943cfc1c08f22;hpb=ea996c254e2da8e1f66311aae1e4d076323b0e86;p=packages%2Flibxml2.git

diff --git a/libxml2.spec b/libxml2.spec
index ed20ac6..74a5dab 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,28 +1,36 @@
-
-%include	/usr/lib/rpm/macros.python
-
+#
+# Conditional build:
+%bcond_without	python	# don't build python module
+%bcond_without	static_libs # don't build static libraries
+#
 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.4.19
+Version:	2.6.27
 Release:	2
+Epoch:		1
 License:	MIT
 Group:		Libraries
-Source0:	ftp://xmlsoft.org/%{name}-%{version}.tar.gz
+#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
+Patch3:		%{name}-DESTDIR.patch
 URL:		http://xmlsoft.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.2
 BuildRequires:	automake
-BuildRequires:	libtool
+BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	ncurses-devel
-BuildRequires:	python-devel
-BuildRequires:	python-modules
+%{?with_python:BuildRequires:	python-devel}
+%{?with_python:BuildRequires:	python-modules}
 BuildRequires:	readline-devel >= 4.2
-BuildRequires:	rpm-pythonprov
+%{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	zlib-devel
+Obsoletes:	xml-common
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,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.
@@ -43,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} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	zlib-devel
 
 %description devel
@@ -67,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 = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static libxml2 libraries.
@@ -84,21 +92,22 @@ 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} = %{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
-%pyrequires_eq	python
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+%pyrequires_eq	python-libs
 Obsoletes:	libxml2-python
 
 %description -n python-%{name}
@@ -111,13 +120,18 @@ Modu
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c -f
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	%{!?with_static_libs:--enable-static=no}
+
 %{__make}
 
 %install
@@ -128,36 +142,71 @@ rm -rf $RPM_BUILD_ROOT
 	m4datadir=%{_aclocaldir} \
 	pkgconfigdir=%{_pkgconfigdir}
 
+# move examples to proper dir
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-devel-%{version} \
+	$RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
+mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/examples/* \
+	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-devel-%{version}
+%if %{with python}
+mv -f $RPM_BUILD_ROOT%{_docdir}/%{name}-python-%{version}/examples/* \
+	$RPM_BUILD_ROOT%{_examplesdir}/python-%{name}-%{version}
+%endif
+
+# move html doc to -devel package
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
+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 \
+	> $RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
+
+%if %{with python}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
-gzip -9nf AUTHORS ChangeLog NEWS README TODO
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{py,la,a}
+%endif
 
 %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)
+%doc AUTHORS ChangeLog Copyright NEWS README TODO
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_mandir}/man3/*
 
+%dir %{_sysconfdir}/xml
+%config(noreplace) %verify(not md5 mtime) %{_sysconfdir}/xml/catalog
+
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz doc/{*.{gif,html},html/*}
-%attr(755,root,root) %{_bindir}/*
+%doc %{_docdir}/%{name}-devel-%{version}
+%attr(755,root,root) %{_bindir}/xml2-config
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_pkgconfigdir}/*
 %{_aclocaldir}/*.m4
 %{_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)
@@ -166,7 +215,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xmlcatalog.1*
 %{_mandir}/man1/xmllint.1*
 
+%if %{with python}
 %files -n python-%{name}
 %defattr(644,root,root,755)
+%doc %{_examplesdir}/python-%{name}-%{version}
 %attr(755,root,root) %{py_sitedir}/*.so
 %{py_sitedir}/*.py[co]
+%endif