[mingw-libxslt] Added win64 support (contributed by Mikkel Kruse Johnsen)

epienbro epienbro at fedoraproject.org
Sun Mar 18 20:49:33 UTC 2012


commit 05e95d40d87617c05f1af39fc9db57909afe64f2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Mar 18 21:49:29 2012 +0100

    Added win64 support (contributed by Mikkel Kruse Johnsen)

 mingw-libxslt.spec |   72 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 58 insertions(+), 14 deletions(-)
---
diff --git a/mingw-libxslt.spec b/mingw-libxslt.spec
index d495bad..8f1435e 100644
--- a/mingw-libxslt.spec
+++ b/mingw-libxslt.spec
@@ -1,10 +1,8 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
 
 Name:           mingw-libxslt
 Version:        1.1.26
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -18,13 +16,20 @@ BuildArch:      noarch
 Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 Patch1001:      mingw32-libxslt-use-correct-mkdir.patch
 
-BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-win-iconv
 BuildRequires:  mingw32-libgcrypt
 BuildRequires:  mingw32-libxml2 >= 2.7.2-3
+
+BuildRequires:  mingw64-filesystem>= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-win-iconv
+BuildRequires:  mingw64-libgcrypt
+BuildRequires:  mingw64-libxml2 >= 2.7.2-3
+
 BuildRequires:  pkgconfig
 BuildRequires:  autoconf, automake, libtool
 
@@ -35,6 +40,7 @@ mechanism. To use it you need to have a version of libxml2 >= 2.6.27
 installed. The xsltproc command is a command line interface to the XSLT engine
 
 
+# Win32
 %package -n mingw32-libxslt
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 Requires:       mingw32-libxml2 >= 2.7.2-3
@@ -46,17 +52,31 @@ This C library allows to transform XML files into other XML files
 mechanism. To use it you need to have a version of libxml2 >= 2.6.27
 installed. The xsltproc command is a command line interface to the XSLT engine
 
-
 %package -n mingw32-libxslt-static
 Summary:        Static version of the MinGW Windows LibXSLT library
 Requires:       mingw32-libxslt = %{version}-%{release}
-Group:          Development/Libraries
 
 %description -n mingw32-libxslt-static
 Static version of the MinGW Windows LibXSLT library.
 
+# Win64
+%package -n mingw64-libxslt
+Summary:        MinGW Windows Library providing the Gnome XSLT engine
+Requires:       mingw64-libxml2 >= 2.7.2-3
+Requires:       pkgconfig
+
+%description -n mingw64-libxslt
+This C library allows to transform XML files into other XML files
+(or HTML, text, ...) using the standard XSLT stylesheet transformation
+mechanism. To use it you need to have a version of libxml2 >= 2.6.27
+installed. The xsltproc command is a command line interface to the XSLT engine
+
+%package -n mingw64-libxslt-static
+Summary:        Static version of the MinGW Windows LibXSLT library
+Requires:       mingw64-libxslt = %{version}-%{release}
+
 
-%{?mingw32_debug_package}
+%?mingw_debug_package
 
 
 %prep
@@ -74,22 +94,24 @@ autoreconf
 
 
 %build
-PATH=%{mingw32_bindir}:$PATH \
-%{mingw32_configure} --without-python --enable-shared
-make %{?_smp_mflags}
+%mingw_configure --without-python --enable-shared
+%mingw_make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove doc and man which duplicate stuff already in Fedora native package.
 rm -r $RPM_BUILD_ROOT%{mingw32_docdir}
 rm -r $RPM_BUILD_ROOT%{mingw32_mandir}
+rm -r $RPM_BUILD_ROOT%{mingw64_docdir}
+rm -r $RPM_BUILD_ROOT%{mingw64_mandir}
 
 # Drop all .la files
 find $RPM_BUILD_ROOT -name "*.la" -delete
 
 
+# Win32
 %files -n mingw32-libxslt
 %doc COPYING Copyright
 %{mingw32_bindir}/xslt-config
@@ -105,13 +127,35 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 %{mingw32_libdir}/xsltConf.sh
 %{mingw32_datadir}/aclocal/libxslt.m4
 
-
 %files -n mingw32-libxslt-static
 %{mingw32_libdir}/libexslt.a
 %{mingw32_libdir}/libxslt.a
 
+# Win64
+%files -n mingw64-libxslt
+%doc COPYING Copyright
+%{mingw64_bindir}/xslt-config
+%{mingw64_bindir}/xsltproc.exe
+%{mingw64_includedir}/libexslt
+%{mingw64_includedir}/libxslt
+%{mingw64_bindir}/libexslt-0.dll
+%{mingw64_libdir}/libexslt.dll.a
+%{mingw64_bindir}/libxslt-1.dll
+%{mingw64_libdir}/libxslt.dll.a
+%{mingw64_libdir}/pkgconfig/libexslt.pc
+%{mingw64_libdir}/pkgconfig/libxslt.pc
+%{mingw64_libdir}/xsltConf.sh
+%{mingw64_datadir}/aclocal/libxslt.m4
+
+%files -n mingw64-libxslt-static
+%{mingw64_libdir}/libexslt.a
+%{mingw64_libdir}/libxslt.a
+
 
 %changelog
+* Sun Mar 18 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-9
+- Added win64 support (contributed by Mikkel Kruse Johnsen)
+
 * Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-8
 - Dropped .la files
 


More information about the scm-commits mailing list