rpms/mingw32-libxslt/F-11 mingw32-libxslt-dont-use-pthread.patch, NONE, 1.1 mingw32-libxslt.spec, 1.4, 1.5 mingw32-libxslt-1.1.24-win32-shared.patch, 1.1, NONE

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-libxslt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2744

Modified Files:
	mingw32-libxslt.spec 
Added Files:
	mingw32-libxslt-dont-use-pthread.patch 
Removed Files:
	mingw32-libxslt-1.1.24-win32-shared.patch 
Log Message:
Merged the changes from the F-12 package


mingw32-libxslt-dont-use-pthread.patch:
 configure.in |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE mingw32-libxslt-dont-use-pthread.patch ---
--- libxslt-1.1.25/configure.in.orig	2009-09-17 19:41:13.219723199 +0200
+++ libxslt-1.1.25/configure.in	2009-09-17 19:41:22.887973276 +0200
@@ -137,12 +137,6 @@
 
 dnl Look for pthread.h, needed for testThreads
 THREAD_LIBS=""
-AC_CHECK_HEADER(pthread.h,
-    AC_CHECK_LIB(pthread, pthread_join,[
-       AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
-       AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
-       THREAD_LIBS="-lpthread"]))
-
 AC_SUBST(THREAD_LIBS)
 
 dnl


Index: mingw32-libxslt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-libxslt/F-11/mingw32-libxslt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- mingw32-libxslt.spec	24 Sep 2009 20:37:56 -0000	1.4
+++ mingw32-libxslt.spec	24 Sep 2009 20:55:35 -0000	1.5
@@ -17,8 +17,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 
-# Fix compilation on MinGW environments
-Patch1000:      mingw32-libxslt-1.1.24-win32-shared.patch
+# Don't try to use mingw32-pthreads even if it's available 
+Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 
 BuildRequires:  mingw32-filesystem >= 30
 BuildRequires:  mingw32-gcc
@@ -89,8 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/xsltproc.exe
 %{_mingw32_includedir}/libexslt
 %{_mingw32_includedir}/libxslt
-#%{_mingw32_bindir}/libexslt.dll
-#%{_mingw32_libdir}/libexslt.dll.a
+%{_mingw32_bindir}/libexslt-0.dll
+%{_mingw32_libdir}/libexslt.dll.a
 %{_mingw32_libdir}/libexslt.la
 %{_mingw32_bindir}/libxslt-1.dll
 %{_mingw32_libdir}/libxslt.dll.a
@@ -110,7 +110,9 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Sep 24 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.26-1
 - Update to 1.1.26
-- Drop upstreamed patch
+- Drop upstreamed CVE patch
+- Dropped upstreamed mingw32 patches
+- Added a patch to never use pthreads even if it's available
 
 * Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.24-7
 - Use %%global instead of %%define


--- mingw32-libxslt-1.1.24-win32-shared.patch DELETED ---