X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libxml2%2Fmingw-libxml2.spec;h=ae7b1767a6bd1fe82b48b7cdd1b0de996c8a23d2;hb=ba70f03694c6ba6f858683093c9e107fdd3fb49b;hp=b12ba95b747c363575cb1dc5e9bd34d30c931bcc;hpb=3fe1acf6b4cedee45f2d944707a68aea1c51f0d8;p=fedora-mingw.git

diff --git a/libxml2/mingw-libxml2.spec b/libxml2/mingw-libxml2.spec
index b12ba95..ae7b176 100644
--- a/libxml2/mingw-libxml2.spec
+++ b/libxml2/mingw-libxml2.spec
@@ -1,8 +1,12 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-libxml2
 Version:        2.6.32
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        LGPLv2+
@@ -11,11 +15,14 @@ URL:            http://www.xmlsoft.org/
 Source0:        ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:      noarch
+
+BuildRequires:  mingw-filesystem >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 BuildRequires:  mingw-zlib
+BuildRequires:  mingw-gettext
 
-Requires:       mingw-runtime
 
 %description
 MinGW Windows libxml2 XML processing library.
@@ -26,13 +33,7 @@ MinGW Windows libxml2 XML processing library.
 
 
 %build
-CFLAGS="-O2 -g -Wall -pipe" LDFLAGS="-no-undefined" \
-./configure \
-  --build=%_build \
-  --host=i686-pc-mingw32 \
-  --prefix=%{_prefix}/i686-pc-mingw32/sys-root/mingw \
-  --without-python
-
+LDFLAGS="-no-undefined" %{_mingw_configure} --without-python
 make
 
 
@@ -41,6 +42,11 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libxml2.a
+
+# Remove manpages which duplicate Fedora native.
+rm -rf $RPM_BUILD_ROOT%{_mingw_mandir}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,16 +54,32 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/bin/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/aclocal/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/doc/libxml2-%{version}/
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/gtk-doc/html/libxml2/
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man1/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/*
+%{_mingw_bindir}/libxml2-2.dll
+%{_mingw_bindir}/xml2-config
+%{_mingw_bindir}/xmlcatalog.exe
+%{_mingw_bindir}/xmllint.exe
+%{_mingw_libdir}/libxml2.dll.a
+%{_mingw_libdir}/libxml2.la
+%{_mingw_libdir}/pkgconfig
+%{_mingw_libdir}/pkgconfig/libxml-2.0.pc
+%{_mingw_libdir}/xml2Conf.sh
+%{_mingw_includedir}/libxml2
+%{_mingw_datadir}/aclocal/*
+%{_mingw_docdir}/libxml2-%{version}/
+%{_mingw_datadir}/gtk-doc/html/libxml2/
 
 
 %changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-5
+- Remove manpages which duplicate Fedora native.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-4
+- Remove static libraries.
+- List libdir files explicitly.
+
+* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-3
+- Use RPM macros from mingw-filesystem.
+- BuildArch is noarch.
+
 * Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.6.32-1
 - Initial RPM release, largely based on earlier work from several sources.