From ac1b2e39d54f1ee90734c15206d266985581e03c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 16 Mar 2024 17:31:20 +0100 Subject: [PATCH] update to 9.2 [release 9.2-1mamba;Wed Feb 14 2024] --- wine-systemd-32 | 7 +-- wine-systemd-64 | 7 +-- wine.spec | 120 ++++++++++++++++++++++++++---------------------- 3 files changed, 68 insertions(+), 66 deletions(-) diff --git a/wine-systemd-32 b/wine-systemd-32 index 537dd89..4d43073 100644 --- a/wine-systemd-32 +++ b/wine-systemd-32 @@ -1,5 +1,2 @@ -# Pre-PE Windows Executables -:windows:M::MZ::/usr/bin/wine: - -# PE Windows Executables -:windowsPE:M::PE::/usr/bin/wine: +# Start WINE on Windows executables +:DOSWin:M::MZ::/usr/bin/wine: diff --git a/wine-systemd-64 b/wine-systemd-64 index 9869244..6ee2fed 100644 --- a/wine-systemd-64 +++ b/wine-systemd-64 @@ -1,5 +1,2 @@ -# Pre-PE Windows Executables -:windows:M::MZ::/usr/bin/wine64: - -# PE Windows Executables -:windowsPE:M::PE::/usr/bin/wine64: +# Start WINE on Windows executables +:DOSWin:M::MZ::/usr/bin/wine64: diff --git a/wine.spec b/wine.spec index 30299b9..d3c18ca 100644 --- a/wine.spec +++ b/wine.spec @@ -3,18 +3,18 @@ %define _use_internal_dependency_generator 1 # see https://wiki.winehq.org/Gecko -%define wine_gecko_ver 2.47.3 +%define wine_gecko_ver 2.47.4 # see: http://wiki.winehq.org/Mono -%define wine_mono_ver 7.4.0 +%define wine_mono_ver 9.0.0 %define wine_staging_ver %(echo %version | cut -d. -f1-2) -%define WINE_GECKO_CHECKED_FOR_VERSION 8.0.2 +%define WINE_GECKO_CHECKED_FOR_VERSION 9.2 #% global __brp_strip_lto %nil %global __brp_strip_static_archive %nil Name: wine -Version: 8.0.2 +Version: 9.2 Release: 1mamba Epoch: 3 Summary: An open source implementation of the Windows API on top of X and Unix @@ -23,7 +23,7 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.winehq.org/ -Source0: https://dl.winehq.org/wine/source/%{majver}/wine-%{version}.tar.xz +Source0: https://dl.winehq.org/wine/source/%{MAJver}.x/wine-%{version}.tar.xz Source1: wine-systemd-32 Source2: wine-systemd-64 Source3: wine_hidden_kde-desktop @@ -60,11 +60,14 @@ BuildRequires: libgphoto2-devel BuildRequires: libgst-plugins-base-devel BuildRequires: libgstreamer-devel BuildRequires: libpcap-devel +BuildRequires: libpcsclite-devel BuildRequires: libperl BuildRequires: libpulseaudio-devel BuildRequires: libudev-devel BuildRequires: libunwind-devel BuildRequires: libusb-devel +BuildRequires: libwayland-devel +BuildRequires: libxkbcommon-devel BuildRequires: ocl-icd-devel BuildRequires: perl-devel BuildRequires: sane-backends-devel @@ -104,7 +107,6 @@ BuildRequires: chrpath #BuildRequires: docbook-dtds >= 1.0 Requires: libGLUT >= 3.7 Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: %{name}-desktop = %{epoch}:%{version}-%{release} Requires: %{name}-fonts = %{epoch}:%{version}-%{release} Requires: libwine = %{epoch}:%{version}-%{release} Requires: samba-winbind @@ -128,18 +130,19 @@ Summary: Wine core package Group: Applications/Emulators Requires: libwine = %{epoch}:%{version}-%{release} Requires: wine-common = %{epoch}:%{version}-%{release} -Requires: libxslt -Requires: libGL-Mesa-dri -Requires: libva -Requires: libcairo -Requires: libcapi20 -Requires: libv4l -Requires: libsane-backends -Requires: libnetapi -Requires: libodbc -Requires: libpng -Requires: libOSMesa -Requires: libgnome-keyring +Requires: libxslt +Requires: libGL-Mesa-dri +Requires: libva +Requires: libcairo +Requires: libcapi20 +Requires: libv4l +Requires: libsane-backends +Requires: libnetapi +Requires: libodbc +Requires: libpng +Requires: libOSMesa +Requires: libgnome-keyring +Obsoletes: wine-desktop <= 3:9.0-1mamba %description core While Wine is usually thought of as a Windows(TM) emulator, the Wine developers would prefer that users thought of Wine as a Windows compatibility layer for UNIX. @@ -200,11 +203,9 @@ Header, include files and library definition files for developing applications w exit 1 %endif -#%patch0 -p1 -b .fix-conflict-ldap_contact - -# 6.0.2: wine-staging patches do not apply, temporary disabled -#tar xvf %{SOURCE100} --strip-components 1 -#./patches/patchinstall.sh DESTDIR="$(pwd)" --all +# Apply wine-staging patches +tar xvf %{SOURCE100} --strip-components 1 +staging/patchinstall.py DESTDIR="`pwd`" --all %build #:<< __EOF @@ -215,7 +216,7 @@ Header, include files and library definition files for developing applications w --with-gstreamer \ --with-xattr \ %ifarch x86_64 - --enable-win64 + --enable-win64 \ %endif # --disable-tests @@ -228,14 +229,14 @@ Header, include files and library definition files for developing applications w %makeinstall LDCONFIG=/bin/true # allow users to launch Windows programs by just clicking on the .exe file... -install -d %{buildroot}%{_sysconfdir}/binfmt.d %ifarch %{ix86} %{arm} -install -m 644 %{S:1} %{buildroot}%{_sysconfdir}/binfmt.d/wine.conf +install -D -m 644 %{S:1} %{buildroot}%{_binfmtdir}/wine.conf %endif %ifarch x86_64 -install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/binfmt.d/wine.conf +install -D -m 644 %{S:2} %{buildroot}%{_binfmtdir}/wine.conf %endif +:<< __DESKTOP_DISABLED # install menu, desktop, and mime files install -D -m 644 %{S:3} %{buildroot}%{_kde4_sharedir}/applnk/.hidden/%{name}.desktop install -D -m 644 %{S:5} \ @@ -316,6 +317,7 @@ install -p -m 644 programs/iexplore/iexplore*png \ %{buildroot}%{_datadir}/pixmaps/iexplore.png desktop-file-install --vendor=%{_vendor} \ --dir=%{buildroot}%{_datadir}/applications %{S:16} +__DESKTOP_DISABLED # install the Mozilla's Gecko Layout Engine install -d %{buildroot}%{_datadir}/wine/gecko @@ -342,7 +344,7 @@ chrpath --delete %{buildroot}%{_bindir}/wrc chrpath --delete %{buildroot}%{_bindir}/wmc # remove unpackaged files -rm -f %{buildroot}%{_datadir}/applications/wine.desktop +#rm -f %{buildroot}%{_datadir}/applications/wine.desktop %ifarch x86_64 find %{buildroot}%{_mandir} -name wine.1 | while read line; do mv $line ${line/.1*}64.1; done @@ -382,13 +384,10 @@ exit 0 %ifarch x86_64 %{_bindir}/wine64 %{_bindir}/wine64-preloader -#%{_mandir}/pl.UTF-8/man1/wine64.1* -#%{_mandir}/de.UTF-8/man1/wine64.1* -#%{_mandir}/fr.UTF-8/man1/wine64.1* -#%{_mandir}/man1/wine64.1* %else %{_bindir}/wine %{_bindir}/wine-preloader + %{_mandir}/pl.UTF-8/man1/wine.1* %{_mandir}/de.UTF-8/man1/wine.1* %{_mandir}/fr.UTF-8/man1/wine.1* @@ -411,8 +410,9 @@ exit 0 %{_bindir}/winemine %{_bindir}/winepath %{_bindir}/wineserver +%{_datadir}/applications/wine.desktop +%{_binfmtdir}/wine.conf %dir %{_datadir}/wine/fonts -#%{_datadir}/wine/l_intl.nls %{_datadir}/wine/wine*.inf %dir %{_datadir}/wine/gecko %{_datadir}/wine/gecko/wine-gecko-*.msi @@ -449,29 +449,28 @@ exit 0 %dir %{_libdir}/wine/*-windows %{_libdir}/wine/*-windows/* -%files desktop -%defattr(-,root,root) -%{_kde4_sharedir}/applnk/.hidden/wine.desktop -%{_sysconfdir}/xdg/menus/applications-merged/wine.menu -%{_datadir}/desktop-directories/wine.directory -%{_datadir}/applications/%{_vendor}-wine-iexplore.desktop -%{_datadir}/applications/%{_vendor}-wine-notepad.desktop -%{_datadir}/applications/%{_vendor}-wine-oleview.desktop -%{_datadir}/applications/%{_vendor}-wine-regedit.desktop -%{_datadir}/applications/%{_vendor}-wine-uninstaller.desktop -%{_datadir}/applications/%{_vendor}-wine-winecfg.desktop -%{_datadir}/applications/%{_vendor}-wine-winefile.desktop -%{_datadir}/applications/%{_vendor}-wine-winemine.desktop -%{_datadir}/applications/%{_vendor}-wine-winhelp.desktop -%{_datadir}/applications/%{_vendor}-wine-wordpad.desktop -%{_datadir}/pixmaps/iexplore.png -%{_datadir}/pixmaps/notepad.png -%{_datadir}/pixmaps/regedit.png -%{_datadir}/pixmaps/winefile.png -%{_datadir}/pixmaps/winemine.png -%{_datadir}/pixmaps/winhelp.png -%{_datadir}/pixmaps/wordpad.png -%config %{_sysconfdir}/binfmt.d/wine.conf +#%files desktop +#%defattr(-,root,root) +#%{_kde4_sharedir}/applnk/.hidden/wine.desktop +#%{_sysconfdir}/xdg/menus/applications-merged/wine.menu +#%{_datadir}/desktop-directories/wine.directory +#%{_datadir}/applications/%{_vendor}-wine-iexplore.desktop +#%{_datadir}/applications/%{_vendor}-wine-notepad.desktop +#%{_datadir}/applications/%{_vendor}-wine-oleview.desktop +#%{_datadir}/applications/%{_vendor}-wine-regedit.desktop +#%{_datadir}/applications/%{_vendor}-wine-uninstaller.desktop +#%{_datadir}/applications/%{_vendor}-wine-winecfg.desktop +#%{_datadir}/applications/%{_vendor}-wine-winefile.desktop +#%{_datadir}/applications/%{_vendor}-wine-winemine.desktop +#%{_datadir}/applications/%{_vendor}-wine-winhelp.desktop +#%{_datadir}/applications/%{_vendor}-wine-wordpad.desktop +#%{_datadir}/pixmaps/iexplore.png +#%{_datadir}/pixmaps/notepad.png +#%{_datadir}/pixmaps/regedit.png +#%{_datadir}/pixmaps/winefile.png +#%{_datadir}/pixmaps/winemine.png +#%{_datadir}/pixmaps/winhelp.png +#%{_datadir}/pixmaps/wordpad.png %files devel %defattr(-,root,root) @@ -504,6 +503,15 @@ exit 0 #%doc documentation/README.* %changelog +* Wed Feb 14 2024 Silvan Calarco 9.2-1mamba +- update to 9.2 + +* Sun Feb 11 2024 Silvan Calarco 9.0-2mamba +- obsolete desktop package + +* Tue Feb 06 2024 Automatic Build System 9.0-1mamba +- automatic version update by autodist + * Sat Aug 05 2023 Automatic Build System 8.0.2-1mamba - automatic version update by autodist