[mingw-libxslt: 6/20] - Update to 1.1.25 - Dropped upstreamed CVE patch - Dropped upstreamed mingw32 patches - Added a pat

[Kalev Lember]

commit 5f340f100167f4cd01b740bec76090d402ed9c18
Author: epienbro <epienbro at fedoraproject.org>
Date:   Thu Sep 17 17:48:25 2009 +0000

    - Update to 1.1.25
    - Dropped upstreamed CVE patch
    - Dropped upstreamed mingw32 patches
    - Added a patch to never use pthreads even if it's available
    - Automatically generate debuginfo subpackages

 .cvsignore                                |    2 +-
 libexslt-rc4.patch                        |  173 -----------------------------
 mingw32-libxslt-1.1.24-win32-shared.patch |   21 ----
 mingw32-libxslt-dont-use-pthread.patch    |   15 +++
 mingw32-libxslt-ftbfs.patch               |   11 --
 mingw32-libxslt.spec                      |   28 +++--
 sources                                   |    2 +-
 7 files changed, 33 insertions(+), 219 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 12580dd..0d70946 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libxslt-1.1.24.tar.gz
+libxslt-1.1.25.tar.gz
diff --git a/mingw32-libxslt-dont-use-pthread.patch b/mingw32-libxslt-dont-use-pthread.patch
new file mode 100644
index 0000000..deb767f
--- /dev/null
+++ b/mingw32-libxslt-dont-use-pthread.patch
@@ -0,0 +1,15 @@
+--- 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
diff --git a/mingw32-libxslt.spec b/mingw32-libxslt.spec
index 5a54e09..91aef59 100644
--- a/mingw32-libxslt.spec
+++ b/mingw32-libxslt.spec
@@ -3,10 +3,11 @@
 %global _use_internal_dependency_generator 0
 %global __find_requires %{_mingw32_findrequires}
 %global __find_provides %{_mingw32_findprovides}
+%define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-libxslt
-Version:        1.1.24
-Release:        9%{?dist}
+Version:        1.1.25
+Release:        1%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -17,12 +18,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-# Fix for CVE-2008-2935
-Patch1:         libexslt-rc4.patch
-
 # Fix compilation on MinGW environments
-Patch1000:      mingw32-libxslt-1.1.24-win32-shared.patch
-Patch1001:      mingw32-libxslt-ftbfs.patch
+Patch1000:      mingw32-libxslt-dont-use-pthread.patch
 
 BuildRequires:  mingw32-filesystem >= 30
 BuildRequires:  mingw32-gcc
@@ -54,6 +51,9 @@ Group:          Development/Libraries
 Static version of the MinGW Windows LibXSLT library.
 
 
+%{_mingw32_debug_package}
+
+
 %prep
 %setup -q -n libxslt-%{version}
 
@@ -61,10 +61,7 @@ Static version of the MinGW Windows LibXSLT library.
 # this isn't interesting for MinGW environments
 #%patch0 -p1
 
-%patch1 -p0
-
 %patch1000 -p1
-%patch1001 -p0
 
 libtoolize --force --copy
 autoreconf
@@ -96,8 +93,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
@@ -115,6 +112,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 17 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.1.25-1
+- Update to 1.1.25
+- Dropped upstreamed CVE patch
+- Dropped upstreamed mingw32 patches
+- Added a patch to never use pthreads even if it's available
+- Automatically generate debuginfo subpackages
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.24-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 2b5c9b9..2b9f5d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e83ec5d27fc4c10c6f612879bea9a153  libxslt-1.1.24.tar.gz
+50c5ba1218262ac10669961b32db405a  libxslt-1.1.25.tar.gz