Update to 4.8.1

.gitignore

@@ -1 +1 @@
-/wine-mono-4.8.0.tar.gz
+/wine-mono-4.8.1.tar.gz

sources

@@ -1 +1 @@
-SHA512 (wine-mono-4.8.0.tar.gz) = 6f2cdd26f2bb4fdaf98acb7cad629a781c975869bff4fdf78e6dc251fc771da3e7ae9c7112cae5fe12c9adff943ceaa830be135b877c5ab427da2f0e64285346
+SHA512 (wine-mono-4.8.1.tar.gz) = f75f68ea1f084e7badbf0e09cb809e66ee5f1732789704156e81095fdd87f7066093d604c1a8c61b363509b54f79db8e04dc749562513f34e2578b8c82e21c31

wine-mono-build-msifilename.patch

@@ -1,11 +0,0 @@
---- 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
-@@ -434,7 +434,7 @@
- 
- build_msi ()
- {
--	MSIFILENAME=$OUTDIR/winemono.msi
-+	MSIFILENAME=${MSIFILENAME:-winemono.msi}
-     rm -rf cab-contents
-     rm -f "$BUILDDIR/image.cab" "${MSIFILENAME}"
- 

wine-mono-build-static.patch

@@ -1,6 +1,6 @@
---- wine-mono-4.5.6/build-winemono.sh.orig	2015-04-20 10:34:32.150114394 -0500
-+++ wine-mono-4.5.6/build-winemono.sh	2015-04-20 10:33:13.699274928 -0500
-@@ -72,6 +72,7 @@
+--- wine-mono-4.8.1/build-winemono.sh.orig	2015-04-20 10:34:32.150114394 -0500
++++ wine-mono-4.8.1/build-winemono.sh	2015-04-20 10:33:13.699274928 -0500
+@@ -73,6 +73,7 @@
      cd "$BUILDDIR/build-cross-$ARCH"
      if test 1 != $REBUILD || test ! -e Makefile; then
          CPPFLAGS="-gdwarf-2 -gstrict-dwarf" "$SRCDIR"/mono/configure --prefix="$BUILDDIR/build-cross-$ARCH-install" --build=$BUILD --target=$MINGW --host=$MINGW --with-tls=none --disable-mcs-build --enable-win32-dllmain=yes --with-libgc-threads=win32 PKG_CONFIG=false mono_cv_clang=no || exit 1
@@ -8,15 +8,15 @@
          sed -e 's/-lgcc_s//' -i libtool
      fi
      WINEPREFIX=/dev/null make $MAKEOPTS || exit 1
-@@ -118,6 +119,7 @@
+@@ -162,6 +163,7 @@
      cd "$BUILDDIR/build-cross-cli"
      if test 1 != $REBUILD || test ! -e Makefile; then
          "$SRCDIR"/mono/configure --prefix="$BUILDDIR/build-cross-cli-install" --with-mcs-docs=no --disable-system-aot || exit 1
 +        sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
      fi
-     if test 1 = $USE_MONOLITE; then
-         make get-monolite-latest || exit 1
-@@ -180,6 +182,7 @@
+ 
+ 	# put a System.Native library somewhere monolite can find it during the build
+@@ -232,6 +234,7 @@
      # build mono-basic
      cd "$SRCDIR/mono-basic"
      ./configure --prefix="$BUILDDIR/build-cross-cli-win32-install" || exit 1

wine-mono-monolite.patch

@@ -1,19 +0,0 @@
-diff --git a/build-winemono.sh b/build-winemono.sh
-index bee0dbf..7f0b062 100755
---- a/build-winemono.sh
-+++ b/build-winemono.sh
-@@ -120,6 +120,14 @@
-         "$SRCDIR"/mono/configure --prefix="$BUILDDIR/build-cross-cli-install" --with-mcs-docs=no --disable-system-aot || exit 1
-         sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
-     fi
-+
-+	# put a System.Native library somewhere monolite can find it during the build
-+	cd "$BUILDDIR/build-cross-cli/mono/native"
-+	make $MAKEOPTS || exit 1
-+	mkdir "$BUILDDIR/build-cross-cli/mono/lib/"
-+	cp .libs/libmono-native.so "$BUILDDIR/build-cross-cli/mono/lib/libSystem.Native.so" || exit 1
-+
-+    cd "$BUILDDIR/build-cross-cli"
-     if test 1 = $USE_MONOLITE; then
-         make get-monolite-latest || exit 1
-     elif test -e $SRCDIR/monolite/mcs.exe; then

wine-mono.spec

@@ -2,19 +2,15 @@
 %{?mingw_package_header}
 
 Name:           wine-mono
-Version:        4.8.0
+Version:        4.8.1
 Release:        1%{?dist}
 Summary:        Mono library required for Wine
 
 License:        GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1
 URL:            http://wiki.winehq.org/Mono
 Source0:        http://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}.tar.gz
-Patch0:         wine-mono-build-msifilename.patch
 # to statically link in winpthreads
-Patch1:         wine-mono-build-static.patch
-# Fix from upstream for built-in monolite
-# https://www.winehq.org/pipermail/wine-devel/2019-March/140838.html
-Patch2:         wine-mono-monolite.patch
+Patch0:         wine-mono-build-static.patch
 
 # see git://github.com/madewokherd/wine-mono
 
@@ -57,11 +53,11 @@ Requires: wine-filesystem
 %description
 Windows Mono library required for Wine.
 
+%{?mingw_debug_package}
+
 %prep
 %setup -q
-%patch0 -p1 -b.msifilename
-%patch1 -p1 -b.static
-%patch2 -p1 -b.monolite
+%patch0 -p1 -b.static
 
 # Fix all Python shebangs
 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
@@ -71,9 +67,9 @@ sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.
 MAKEOPTS=%{_smp_mflags} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh
 
 %install
-mkdir -p %{buildroot}%{_datadir}/wine/mono
-install -p -m 0644 cab-contents/wine-mono-%{version}.msi \
-    %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}.msi
+mkdir -p %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/
+cp -rp image/* \
+    %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/
 
 # prep licenses
 cp mono/LICENSE mono-LICENSE
@@ -95,9 +91,13 @@ cp mono-basic/LICENSE mono-basic-LICENSE
 %files
 %license COPYING mono-LICENSE mono-COPYING.LIB mono-basic-LICENSE mono-mcs*
 %doc README mono-basic-README
-%{_datadir}/wine/mono/wine-mono-%{version}.msi
+%{_datadir}/wine/mono/wine-mono-%{version}/
 
 %changelog
+* Sun Apr 14 2019 Michael Cronenworth <mike@cchtml.com> - 4.8.1-1
+- version upgrade
+- switch from MSI to new shared filesystem format
+
 * Fri Mar 01 2019 Michael Cronenworth <mike@cchtml.com> - 4.8.0-1
 - version upgrade