- updated to 2.12.0

- removed obsolete mingw32 patch

diff --git a/crossmingw32-fontconfig.spec b/crossmingw32-fontconfig.spec
index 54b28f5d456caacf2f5e8feb824980415de7df54..eaeb3efaadac487cf7bda1d5f7818503f9dbd8a9 100644 (file)
--- a/crossmingw32-fontconfig.spec
+++ b/crossmingw32-fontconfig.spec
@@ -2,21 +2,20 @@
 Summary:       Font configuration and customization tools - cross MinGW32 versoin
 Summary(pl.UTF-8):     Narzędzia do konfigurowania fontów - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       2.11.1
-Release:       5
+Version:       2.12.0
+Release:       1
 License:       MIT
 Group:         Development/Libraries
-Source0:       http://fontconfig.org/release/%{realname}-%{version}.tar.bz2
-# Source0-md5: 824d000eb737af6e16c826dd3b2d6c90
+Source0:       https://www.freedesktop.org/software/fontconfig/release/%{realname}-%{version}.tar.bz2
+# Source0-md5: f0313daaec6dce8471a2e57ac08c9fda
 Patch0:                %{realname}-bitstream-cyberbit.patch
-Patch1:                %{realname}-mingw32.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-expat
 BuildRequires: crossmingw32-freetype >= 2.1.5
 BuildRequires: crossmingw32-gcc
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: sed >= 4.0
 Requires:      crossmingw32-expat
@@ -87,7 +86,6 @@ Biblioteka DLL freetype dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 # uses POSIX-specific dirent interfaces
 %{__sed} -i -e 's/test-migration//' test/Makefile.am

diff --git a/fontconfig-mingw32.patch b/fontconfig-mingw32.patch
deleted file mode 100644 (file)
index f2aaada..0000000
--- a/fontconfig-mingw32.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- fontconfig-2.11.1/src/fcint.h.orig 2014-01-20 09:14:20.000000000 +0100
-+++ fontconfig-2.11.1/src/fcint.h      2014-03-25 20:02:08.436489743 +0100
-@@ -29,6 +29,10 @@
- #include <config.h>
- #endif
- 
-+#ifdef _WIN32
-+#include "fcwindows.h"
-+#endif
-+
- #include "fcstdint.h"
- 
- #include <stdlib.h>
---- fontconfig-2.11.1/src/fcwindows.h.orig     2014-01-20 09:14:21.000000000 +0100
-+++ fontconfig-2.11.1/src/fcwindows.h  2014-03-25 19:23:46.449919680 +0100
-@@ -33,7 +33,7 @@
- 
- #ifdef _WIN32
- #  ifndef _WIN32_WINNT
--#    define _WIN32_WINNT 0x0500
-+#    define _WIN32_WINNT 0x0600
- #  endif
- #  define WIN32_LEAN_AND_MEAN
- #  define WIN32_EXTRA_LEAN