From a338d0237b05a2bb500d68c4bdc0808372c96df4 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 9 Mar 2007 11:44:44 +0000
Subject: [PATCH] - fixed build, cleanup, separated -static,-dll

Changed files:
    crossmingw32-libxml2.spec -> 1.2
---
 crossmingw32-libxml2.spec | 89 ++++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 33 deletions(-)

diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec
index 5075752..699e883 100644
--- a/crossmingw32-libxml2.spec
+++ b/crossmingw32-libxml2.spec
@@ -1,28 +1,25 @@
-#
 %define		_realname   libxml2
 Summary:	libXML library - cross Mingw32 version
-Summary(es.UTF-8):Biblioteca libXML version 2
-Summary(pl.UTF-8):Biblioteka libXML wersja 2 - wersja skrośna dla Mingw32
-Summary(pt_BR.UTF-8):Biblioteca libXML versão 2
+Summary(pl.UTF-8):	Biblioteka libXML wersja 2 - wersja skrośna dla Mingw32
 Name:		crossmingw32-%{_realname}
 Version:	2.6.27
 Release:	1
 License:	MIT
-Group:		Libraries
+Group:		Development/Libraries
 #Source0:	http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/%{name}-%{version}.tar.bz2
 Source0:	ftp://xmlsoft.org/libxml2/%{_realname}-%{version}.tar.gz
 # Source0-md5:	f5806f5059ef7bd4d3fcf36cf116d1ef
-Patch0:		%{name}-noexamples.patch
-Patch1:		%{_realname}-man_fixes.patch
-Patch2:		%{_realname}-open.gz.patch
-Patch3:		%{_realname}-DESTDIR.patch
+Patch0:		%{_realname}-man_fixes.patch
+Patch1:		%{_realname}-open.gz.patch
+Patch2:		%{_realname}-DESTDIR.patch
 URL:		http://xmlsoft.org/
 BuildRequires:	autoconf >= 2.2
 BuildRequires:	automake
+BuildRequires:	crossmingw32-gcc
 BuildRequires:	crossmingw32-zlib
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	sed >= 4.0
-Obsoletes:	xml-common
+Requires:	crossmingw32-zlib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -30,35 +27,54 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
 %define		arch			%{_prefix}/%{target}
-%define		gccarch			%{_prefix}/lib/gcc-lib/%{target}
-%define		gcclib			%{_prefix}/lib/gcc-lib/%{target}/%{version}
 
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
 %define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
+%define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
 %description
 This library allows you to manipulate XML files.
 
-%description -l es.UTF-8
-Esta biblioteca permite manipulación de archivos XML.
+This package contains the cross version for Win32.
 
 %description -l pl.UTF-8
 Biblioteka libxml2 umożliwia manipulowanie zawartością plików XML.
 
-%description -l pt_BR.UTF-8
-Esta biblioteca permite a manipulação de arquivos XML.
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:	Static libxml2 library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka libxml2 (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static libxml2 library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libxml2 (wersja skrośna mingw32).
+
+%package dll
+Summary:	DLL libxml2 library for Windows
+Summary(pl.UTF-8):	Biblioteka DLL libxml2 dla Windows
+Group:		Applications/Emulators
+Requires:	crossmingw32-zlib-dll
+Requires:	wine
+
+%description dll
+DLL libxml2 library for Windows.
+
+%description dll -l pl.UTF-8
+Biblioteka DLL libxml2 dla Windows.
 
 %prep
 %setup -q -n %{_realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-sed -i -e 's,-L/usr/lib64,-L/usr/%{_lib},' xml2-config.in
 
 %build
 export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
@@ -70,6 +86,7 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
 %configure \
 	--target=%{target} \
 	--host=%{target} \
+	--without-python
 
 %{__make}
 
@@ -77,12 +94,17 @@ export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	m4datadir=%{_aclocaldir} \
-	pkgconfigdir=%{_pkgconfigdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-# install catalog file
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/xml
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,14 +112,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog Copyright NEWS README TODO
-%{_libdir}/lib*.la
-%{_libdir}/lib*.a
-%{_bindir}/*.dll
+%{_libdir}/libxml2.dll.a
+%{_libdir}/libxml2.la
+%{_includedir}/libxml2
+%{_pkgconfigdir}/libxml-2.0.pc
 
-#%dir %{_prefix}/%{_sysconfdir}/xml
-#%config(noreplace) %verify(not md5 mtime) %{_sysconfdir}/xml/catalog
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libxml2.a
 
-%attr(755,root,root) %{_bindir}/xml2-config
-%{_pkgconfigdir}/*
-%{_aclocaldir}/*.m4
-%{_includedir}/libxml2
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libxml2-*.dll
-- 
2.43.0