diff --git a/.gitignore b/.gitignore index c2c3c6a..01208b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/wine-mono-9.0.0-src.tar.xz +SOURCES/wine-mono-9.0.0-x86.tar.xz diff --git a/.wine-mono.metadata b/.wine-mono.metadata index da159d0..3efece5 100644 --- a/.wine-mono.metadata +++ b/.wine-mono.metadata @@ -1 +1 @@ -6d2cfe1548ad70298adee5d4f7ca431e6e64b7b9 SOURCES/wine-mono-9.0.0-src.tar.xz +d0caace3959a2703124a4759dcf6d563cc2ff1fa SOURCES/wine-mono-9.0.0-x86.tar.xz diff --git a/SPECS/wine-mono.spec b/SPECS/wine-mono.spec index 8ed6735..422d421 100644 --- a/SPECS/wine-mono.spec +++ b/SPECS/wine-mono.spec @@ -10,49 +10,9 @@ Summary: Mono library required for Wine License: GPL-2.0-or-later AND LGPL-2.1-only AND MIT AND BSD-4-Clause-UC AND MS-PL AND MPL-1.1 URL: http://wiki.winehq.org/Mono # https://github.com/madewokherd/wine-mono -Source0: https://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}-src.tar.xz -Patch0: wine-mono-7.3.0-iconv.patch - -# see git://github.com/madewokherd/wine-mono +Source0: https://dl.winehq.org/wine/wine-mono/%{version}/wine-mono-%{version}-x86.tar.xz BuildArch: noarch -ExcludeArch: %{power64} s390x s390 - -# 64 -BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw64-headers -BuildRequires: mingw64-cpp -BuildRequires: mingw64-gcc -BuildRequires: mingw64-gcc-c++ -BuildRequires: mingw64-crt -BuildRequires: mingw64-winpthreads-static -# 32 -BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw32-headers -BuildRequires: mingw32-cpp -BuildRequires: mingw32-gcc -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-crt -BuildRequires: mingw32-winpthreads-static - -BuildRequires: autoconf automake -BuildRequires: bc -BuildRequires: cmake -BuildRequires: dos2unix -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: make -BuildRequires: pkgconfig -BuildRequires: gettext -BuildRequires: libgdiplus -BuildRequires: wine-core -BuildRequires: /usr/bin/python -BuildRequires: python3-setuptools -BuildRequires: python3-devel - -# https://bugs.winehq.org/show_bug.cgi?id=48937 -# fixed in wine 5.7 -BuildRequires: dos2unix Requires: wine-filesystem @@ -67,63 +27,21 @@ Windows Mono library required for Wine. %prep %setup -q -%patch -P 0 -p1 -b.iconv - -# Fix all Python shebangs -%py3_shebang_fix . -sed -i 's/GENMDESC_PRG=python/GENMDESC_PRG=python3/' mono/mono/mini/Makefile.am.in - -# remove shipped compiler -rm -rf llvm-mingw-20210423-ucrt-ubuntu-18.04-x86_64/* -sed -i 's/$CPPFLAGS_FOR_BTLS $btls_cflags/$CPPFLAGS_FOR_BTLS -fPIC $btls_cflags/' mono/configure.ac -sed -i 's/-gcodeview //' GNUmakefile -sed -i 's/-Wl,-pdb=//' GNUmakefile -sed -i 's/WINE=wine/WINE=wine64/g' GNUmakefile - -# workaround coreutils 9.2 behavior change to "cp -n" option (RHBZ#2208129) -# https://github.com/madewokherd/wine-mono/issues/164 -sed -i 's~cp -n $(IMAGEDIR)/lib/mono/4.8-api/\*.dll $(IMAGEDIR)/lib/mono/4.5/~cp -n $(IMAGEDIR)/lib/mono/4.8-api/\*.dll $(IMAGEDIR)/lib/mono/4.5/ || true~' mono.make %build -export BTLS_CFLAGS="-fPIC" -export CPPFLAGS_FOR_BTLS="-fPIC" -# Disable LLVM compiler as we do not ship a full, updated MinGW environment. Use GCC instead. -echo "AUTO_LLVM_MINGW=0" > user-config.make -# Disable WpfGfx as it requires LLVM to compile -echo "ENABLE_DOTNET_CORE_WPFGFX=0" >> user-config.make -%make_build image %install mkdir -p %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/ -cp -rp image/* \ +cp -rp * \ %{buildroot}%{_datadir}/wine/mono/wine-mono-%{version}/ -# prep licenses -cp mono/LICENSE mono-LICENSE -cp mono/COPYING.LIB mono-COPYING.LIB -cp mono/mcs/COPYING mono-mcs-COPYING - -pushd mono/mcs - -for l in `ls LICENSE*`; do -echo $l -cp $l ../../mono-mcs-$l -done - -popd - -cp mono-basic/README mono-basic-README -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}/ %changelog * Tue Mar 05 2024 Arkady L. Shane - 9.0.0-1.inferit -- Update to 9.0.0 -- Fix build by sed -i 's/WINE=wine/WINE=wine64/g' GNUmakefile +- upgrate to 9.0.0 +- binary build * Mon Oct 30 2023 Michael Cronenworth - 8.1.0-1 - version upgrade