From a17a5bd21f11371d77b528ea3dfef11df77cc1ca Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Sat, 15 Nov 2014 09:18:55 +0100
Subject: [PATCH] 4.5.4-1

- version upgrade
---
 .gitignore                        |  2 +-
 sources                           |  2 +-
 wine-mono-build-msifilename.patch |  6 +++---
 wine-mono-static-gcc.patch        | 22 ----------------------
 wine-mono.spec                    | 11 ++++++-----
 5 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 wine-mono-static-gcc.patch

diff --git a/.gitignore b/.gitignore
index 5c7906f..324ebfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/wine-mono-4.5.2.tar.gz
+/wine-mono-4.5.4.tar.gz
diff --git a/sources b/sources
index d567687..b0bc3fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10a69a641881490bdfee48b2e4fdf63d  wine-mono-4.5.2.tar.gz
+66941777fe98c6e72351a081ab4d2c09  wine-mono-4.5.4.tar.gz
diff --git a/wine-mono-build-msifilename.patch b/wine-mono-build-msifilename.patch
index f89c170..cfb4795 100644
--- a/wine-mono-build-msifilename.patch
+++ b/wine-mono-build-msifilename.patch
@@ -1,5 +1,5 @@
---- wine-mono-0.0.8/build-winemono.sh.orig	2012-10-29 22:15:31.409448612 +0100
-+++ wine-mono-0.0.8/build-winemono.sh	2012-10-29 22:15:52.878292404 +0100
+--- wine-mono-4.5.4/build-winemono.sh.orig	2014-11-14 18:02:57.810439383 +0100
++++ wine-mono-4.5.4/build-winemono.sh	2014-11-14 18:03:20.583738750 +0100
 @@ -9,7 +9,7 @@
  ORIGINAL_PATH="$PATH"
  REBUILD=0
@@ -7,5 +7,5 @@
 -MSIFILENAME=winemono.msi
 +MSIFILENAME=${MSIFILENAME:-winemono.msi}
  BUILD_TESTS=0
+ USE_MONOLITE=0
  
- usage ()
diff --git a/wine-mono-static-gcc.patch b/wine-mono-static-gcc.patch
deleted file mode 100644
index c939ef7..0000000
--- a/wine-mono-static-gcc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wine-mono-4.5.2/mono/configure.in.orig	2014-06-24 21:12:59.841794023 -0500
-+++ wine-mono-4.5.2/mono/configure.in	2014-06-24 23:26:13.675935649 -0500
-@@ -117,6 +117,8 @@
- 			AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW])
- 		fi
- 		HOST_CC="gcc"
-+		CC="$host-gcc -static-libgcc"
-+		CXX="$host-g++ -static-libgcc"
- 		# Windows 2000 is required that includes Internet Explorer 5.01
- 		CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024 -DGC_NOT_DLL"
- 		LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
---- wine-mono-4.5.2/mono/eglib/configure.ac.orig	2014-06-24 21:55:52.707897667 -0500
-+++ wine-mono-4.5.2/mono/eglib/configure.ac	2014-06-24 23:28:01.488241190 -0500
-@@ -57,6 +57,8 @@
-     SEARCHSEP=';'
-     OS="WIN32"
-     PIDTYPE='void *'
-+    CC="$host-gcc -static-libgcc"
-+    CXX="$host-g++ -static-libgcc"
-     ;;
- *-*darwin*)
-     platform_darwin=yes
diff --git a/wine-mono.spec b/wine-mono.spec
index 56ec885..fc564c4 100644
--- a/wine-mono.spec
+++ b/wine-mono.spec
@@ -1,8 +1,8 @@
 %{?mingw_package_header}
 
 Name:           wine-mono
-Version:        4.5.2
-Release:        4%{?dist}
+Version:        4.5.4
+Release:        1%{?dist}
 Summary:        Mono library required for Wine
 
 License:        GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1
@@ -50,7 +50,6 @@ Windows Mono library required for Wine.
 %prep
 %setup -q
 %patch0 -p1 -b.msifilename
-%patch1 -p1 -b.static-gcc
 
 %build
 # make sure this builds on x86-64
@@ -84,16 +83,18 @@ popd
 
 cp mono-basic/README mono-basic-README
 cp mono-basic/LICENSE mono-basic-LICENSE
-cp MonoGame/LICENSE.txt MonoGame-LICENSE.txt
 
 %files
 %doc COPYING README
 %doc mono-LICENSE mono-COPYING.LIB mono-mcs*
 %doc mono-basic-README mono-basic-LICENSE
-%doc MonoGame-LICENSE.txt
 %{_datadir}/wine/mono/wine-mono-%{version}.msi
 
 %changelog
+* Fri Nov 14 2014 Andreas Bierfert <andreas.bierfert@lowlatency.de>
+- 4.5.4-1
+- version upgrade
+
 * Tue Jun 24 2014 Michael Cronenworth <mike@cchtml.com> - 4.5.2-4
 - Rebuilt to use static libgcc (#1056436)