Update to 4.7.0

.gitignore

@@ -1 +1 @@
-/wine-mono-4.6.4.tar.gz
+/wine-mono-4.7.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (wine-mono-4.6.4.tar.gz) = 7c77865f8b72e27650fd4edbfe9324139e940ba67428630562f8baa654bb9f855a7cb6cfd644142cf5cfb3c7470ad28fd4f0d267be89a9ce602ac054d8e3dda3
+SHA512 (wine-mono-4.7.0.tar.gz) = 1540ead9eb04e0c692211151418afc32e51cc735714ae5d10d4ec7004fe28c0ec6efc0bbab4310d49fdef2df274383fcab9b5d6558b79bab464ba028bc49849a

wine-mono-build-msifilename.patch

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

wine-mono-build-static.patch

@@ -1,18 +1,26 @@
 --- 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
-@@ -63,6 +63,7 @@
+@@ -72,6 +72,7 @@
-     cd "$CURDIR/build-cross-$ARCH"
+     cd "$BUILDDIR/build-cross-$ARCH"
      if test 1 != $REBUILD || test ! -e Makefile; then
-         CPPFLAGS="-gdwarf-2 -gstrict-dwarf" ../mono/configure --prefix="$CURDIR/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
+         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
 +        sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
          sed -e 's/-lgcc_s//' -i libtool
      fi
      WINEPREFIX=/dev/null make $MAKEOPTS || exit 1
-@@ -109,6 +110,7 @@
+@@ -118,6 +119,7 @@
-     cd "$CURDIR/build-cross-cli"
+     cd "$BUILDDIR/build-cross-cli"
      if test 1 != $REBUILD || test ! -e Makefile; then
-         ../mono/configure --prefix="$CURDIR/build-cross-cli-install" --with-mcs-docs=no --disable-system-aot || exit 1
+         "$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
+@@ -172,6 +174,7 @@
+     # build mono-basic
+     cd "$SRCDIR/mono-basic"
+     ./configure --prefix="$BUILDDIR/build-cross-cli-install" || exit 1
++    sed -e 's+compiler_flags="-specs=/usr/lib/rpm/redhat/redhat-hardened-ld"+compiler_flags="-static"+' -i libtool
+     make $MAKEOPTS || exit 1
+     make install || exit 1
+ 

wine-mono.spec

@@ -2,8 +2,8 @@
 %{?mingw_package_header}
 
 Name:           wine-mono
-Version:        4.6.4
+Version:        4.7.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Mono library required for Wine
 
 License:        GPLv2 and LGPLv2 and MIT and BSD and MS-PL and MPLv1.1
@@ -37,6 +37,8 @@ BuildRequires:  mingw32-crt
 BuildRequires:  mingw32-winpthreads-static
 
 BuildRequires:  autoconf automake
+BuildRequires:  bc
+BuildRequires:  cmake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  gettext
@@ -44,7 +46,6 @@ BuildRequires:  zip
 BuildRequires:  wine-core
 BuildRequires:  wine-devel
 BuildRequires:  mono-core
-BuildRequires:  bc
 
 Requires: wine-filesystem
 
@@ -61,19 +62,16 @@ MAKEOPTS=%{_smp_mflags} MSIFILENAME=wine-mono-%{version}.msi ./build-winemono.sh
 
 %install
 mkdir -p %{buildroot}%{_datadir}/wine/mono
-install -p -m 0644 wine-mono-%{version}.msi \
+install -p -m 0644 cab-contents/wine-mono-%{version}.msi \
     %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}.msi
 
 # prep licenses
 cp mono/LICENSE mono-LICENSE
 cp mono/COPYING.LIB mono-COPYING.LIB
+cp mono/mcs/COPYING mono-mcs-COPYING
 
 pushd mono/mcs
 
-sed -i 's/\r//' LICENSE.MSPL
-
-iconv -f iso8859-1 -t utf-8 LICENSE.MSPL > LICENSE.MSPL.conv && mv -f LICENSE.MSPL.conv LICENSE.MSPL
-
 for l in `ls LICENSE*`; do
 echo $l
 cp $l ../../mono-mcs-$l
@@ -90,6 +88,9 @@ cp mono-basic/LICENSE mono-basic-LICENSE
 %{_datadir}/wine/mono/wine-mono-%{version}.msi
 
 %changelog
+* Thu Mar 23 2017 Michael Cronenworth <mike@cchtml.com> - 4.7.0-1
+- version upgrade
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild