Update to 4.6.0

.gitignore

@@ -1 +1 @@
-/wine-mono-4.5.6.tar.gz
+/wine-mono-4.6.0.tar.gz

sources

@@ -1 +1 @@
-f8f1e78bf3e454a9f4c88d7470642736  wine-mono-4.5.6.tar.gz
+dc63164de4e7c06fbb5a619a105477fc  wine-mono-4.6.0.tar.gz

wine-mono-tls.patch

@@ -1,22 +0,0 @@
---- a/mono/utils/mono-compiler.h	2015-02-27 16:42:27.000000000 -0600
-+++ b/mono/utils/mono-compiler.h	2015-04-23 10:52:44.137887962 -0500
-@@ -13,7 +13,7 @@
- #define MONO_FAST_TLS_SET(x,y) x = y
- #define MONO_FAST_TLS_GET(x) x
- #define MONO_FAST_TLS_INIT(x)
--#define MONO_FAST_TLS_DECLARE(x) static __thread gpointer x MONO_TLS_FAST;
-+#define MONO_FAST_TLS_DECLARE(x) static __thread gpointer __attribute__((used)) x MONO_TLS_FAST;
- 
- #if HAVE_TLS_MODEL_ATTR
- 
---- a/mono/metadata/sgen-alloc.c	2015-04-23 11:03:09.641290545 -0500
-+++ b/mono/metadata/sgen-alloc.c	2015-04-23 11:02:56.601136395 -0500
-@@ -94,7 +94,7 @@
- static __thread char *tlab_temp_end;
- static __thread char *tlab_real_end;
- /* Used by the managed allocator/wbarrier */
--static __thread char **tlab_next_addr;
-+static __thread char __attribute__((used)) **tlab_next_addr;
- #endif
- 
- #ifdef HAVE_KW_THREAD

wine-mono.spec

@@ -2,23 +2,19 @@
 %{?mingw_package_header}
 
 Name:           wine-mono
-Version:        4.5.6
-Release:        6%{?dist}
+Version:        4.6.0
+Release:        1%{?dist}
 Summary:        Mono library required for Wine
 
 License:        GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1
 Group:          Development/Libraries
 URL:            http://wiki.winehq.org/Mono
-Source0:        http://sourceforge.net/projects/wine/files/Wine%20Mono/%{version}/%{name}-%{version}.tar.gz
+Source0:        http://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}.tar.gz
 Patch0:         wine-mono-build-msifilename.patch
-# https://github.com/mono/mono/commit/1445d4821c8091c395264542344dca9df22a2c82
-Patch1:         wine-mono-valgrind.patch
 # to statically link in winpthreads
-Patch2:         wine-mono-build-static.patch
-# https://github.com/mono/mono/commit/16ee0252305fbd4f40ea39c3c4421dc7f103f8a0
-Patch3:         wine-mono-tls.patch
+Patch1:         wine-mono-build-static.patch
 # this function gets optimized out when inlined
-Patch4:         wine-mono-build-inline.patch
+Patch2:         wine-mono-build-inline.patch
 
 # see git://github.com/madewokherd/wine-mono
 
@@ -60,13 +56,11 @@ Windows Mono library required for Wine.
 %prep
 %setup -q
 %patch0 -p1 -b.msifilename
-%patch1 -dmono -p1 -b.valgrind
-%patch2 -p1 -b.static
-%patch3 -dmono -p1 -b.tls
-%patch4 -p1 -b.inline
+%patch1 -p1 -b.static
+%patch2 -p1 -b.inline
 
 %build
-MAKEOPTS=%{_smp_mflags} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh
+MAKEOPTS=%{_smp_mflags} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh.static
 
 %install
 mkdir -p %{buildroot}%{_datadir}/wine/mono
@@ -100,6 +94,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE
 %{_datadir}/wine/mono/wine-mono-%{version}.msi
 
 %changelog
+* Tue Mar 08 2016 Michael Cronenworth <mike@cchtml.com> - 4.6.0-1
+- version upgrade
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild