Attachment 14462 Details for Bug 32972 – wine.spec patch to fix wine32 package

[patch] wine.spec patch to fix wine32 package

001-wine-wine32-m10.patch (text/plain), 5.35 KB, created by Aurelian R on 2024-03-15 22:13:23 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-03-15 22:13:23 CET

Size: 5.35 KB

patch

obsolete

>--- wine.spec	2024-02-28 20:14:56.617098338 +0200
>+++ wine.spec	2024-03-10 21:30:21.890806835 +0200
>@@ -186,8 +186,10 @@ be used for porting Win32 code into nati
> %package -n	%{wine}
> Summary:	WINE Is Not An Emulator - runs MS Windows programs
> Group:		Emulators
>+%ifarch x86_64
> Recommends:	%{name}32 = %{epoch}:%{version}-%{release}
>-Recommends:       mingw32-wine-gecko = %gecko_version
>+%endif
>+Recommends: mingw64-wine-gecko = %gecko_version
> %else
> # on 32-bit we always want wine32 package
> Requires:	%{name}32 = %{epoch}:%{version}-%{release}
>@@ -200,6 +202,34 @@ Provides:	wine-bin = %{epoch}:%{version}
> Obsoletes:	%{wine}-utils %{wine}-full %{lib_name}-capi %{lib_name}-twain
> Obsoletes:	%{lib_name} <= %{epoch}:%{version}-%{release}
> Recommends:	sane-frontends
>+
>+Requires(post):     desktop-file-utils
>+Requires(postun):   desktop-file-utils
>+Requires(post):     desktop-common-data
>+Requires(postun):   desktop-common-data
>+Requires(preun):    rpm-helper
>+Requires(post):     rpm-helper
>+%ifarch %{ix86}
>+Conflicts:  wine64
>+%endif
>+%ifarch x86_64
>+Conflicts:  wine
>+%endif
>+
>+%ifnarch x86_64 aarch64
>+%package -n %{name}32
>+Summary:    32-bit support for Wine
>+Group:      Emulators
>+# This is not an EVR-specific requirement, as otherwise on x86_64 urpmi could
>+# resolve the dependency to wine64 even on upgrades, and therefore replace
>+# wine+wine32 installation with a wine32+wine64 installation. - Anssi
>+Requires:   wine-bin
>+# (Anssi) If wine-gecko is not installed, wine pops up a dialog on first
>+# start proposing to download wine-gecko from sourceforge, while recommending
>+# to use distribution packages instead. Therefore suggest wine-gecko here:
>+Recommends: mingw32-wine-gecko = %gecko_version
>+%endif
>+
> %define dlopenreq() %(F=%{_libdir}/lib%{1}.so;[ -e $F ] && (file $F|grep -q ASCII && grep -o 'lib[^ ]*' $F|sed -e "s/\$/%{mark64}/"||objdump -p $F | grep SONAME | awk '{ print $2 "%{mark64}" }') || echo "wine-missing-buildrequires-on-%{1}")
> # wine dlopen's these, so let's add the dependencies ourself
> # Adding these here is especially important with wine, since wine32 is
>@@ -236,17 +266,6 @@ Requires:       %dlopenreq Xxf86vm
> # download pre-built binaries (unlike wine-gecko, same wine-mono works with
> # both wine and wine64):
> Recommends:	wine-mono = %mono_version
>-Requires(post):		desktop-file-utils
>-Requires(postun):	desktop-file-utils
>-Requires(post):		desktop-common-data
>-Requires(postun):	desktop-common-data
>-Requires(preun):	rpm-helper
>-Requires(post):		rpm-helper
>-%ifarch %{ix86}
>-Conflicts:	%{name}64
>-%else
>-Conflicts:	%{name}
>-%endif
> # (tv) needed by games:
> Requires:  %{mklibname dri-drivers}
> %ifnarch x86_64 aarch64
>@@ -273,25 +292,13 @@ Requires:  mingw64-zlib
> %ifarch x86_64 aarch64
> %description -n	%{wine}
> %desc
>-
>-This package contains the Win64 version of Wine. You need the wine32
>-package from the 32-bit repository to be able to run 32-bit applications.
>+This package contains the 64-bit version of Wine.
>+%ifarch x86_64
>+You need the wine32 package from the 32-bit repository
>+to be able to run 32-bit applications.
> %endif
> 
>-%ifnarch x86_64 aarch64
>-%package -n	wine32
>-Summary:	32-bit support for Wine
>-Group:		Emulators
>-# This is not an EVR-specific requirement, as otherwise on x86_64 urpmi could
>-# resolve the dependency to wine64 even on upgrades, and therefore replace
>-# wine+nwine32 installation with a wine32+wine64 installation. - Anssi
>-Requires:	%{name}-bin
>-Conflicts:	%{name} < 1:1.2-0.rc7.1
>-Conflicts:	%{name}64 < 1:1.2-0.rc7.1
>-# (Anssi) If wine-gecko is not installed, wine pops up a dialog on first
>-# start proposing to download wine-gecko from sourceforge, while recommending
>-# to use distribution packages instead. Therefore suggest wine-gecko here:
>-Recommends:       mingw64-wine-gecko = %gecko_version
>+%else
> 
> %description -n	wine32
> Wine is a program which allows running Microsoft Windows programs
>@@ -491,7 +498,7 @@ sed -i 's,Exec=wine ,Exec=wine64 ,' %{bu
> mkdir -p %{buildroot}%{_iconsdir}/hicolor/256x256/apps
> tar -Jxf %{SOURCE3} -C %{buildroot}%{_iconsdir}/hicolor/256x256/apps/
> 
>-%ifarch x86_64 aarch64
>+%ifarch x86_64
> cat > README.install.urpmi <<EOF
> This is the Win64 version of Wine. This version can only be used to run
> 64-bit Windows applications as is. For running 32-bit Windows applications,
>@@ -502,11 +509,6 @@ EOF
> %files -n %{wine}
> %doc ANNOUNCE.md AUTHORS README.md
> %config %{_binfmtdir}/wine.conf
>-%ifarch x86_64 aarch64
>-%doc README.install.urpmi
>-%{_bindir}/%{name}64
>-%{_bindir}/%{name}64-preloader
>-%endif
> %{_bindir}/winecfg
> %{_bindir}/wineconsole*
> %{_bindir}/wineserver
>@@ -522,12 +524,6 @@ EOF
> %{_bindir}/winepath
> %{_bindir}/regsvr32
> %{_bindir}/winefile
>-%ifnarch x86_64
>-%{_mandir}/man?/%{name}.?*
>-%lang(de) %{_mandir}/de.UTF-8/man?/%{name}.?*
>-%lang(fr) %{_mandir}/fr.UTF-8/man?/%{name}.?*
>-%lang(pl) %{_mandir}/pl.UTF-8/man?/%{name}.?*
>-%endif
> %lang(de) %{_mandir}/de.UTF-8/man?/wineserver.?*
> %lang(fr) %{_mandir}/fr.UTF-8/man?/wineserver.?*
> %{_mandir}/man?/wineserver.?*
>@@ -551,12 +547,17 @@ EOF
> %{_datadir}/wine/fonts/*
> %{_iconsdir}/hicolor/*/apps/*.png
> 
>+%ifarch x86_64
>+%doc README.install.urpmi
>+%endif
>+
> %ifnarch x86_64 aarch64
> %files -n wine32
>-%{_bindir}/wine
>-%ifarch %{ix86} %arm
>-%{_bindir}/wine-preloader
> %endif
>+%{_bindir}/%{wine}
>+%{_bindir}/%{wine}-preloader
>+
>+%ifnarch x86_64
> %{_mandir}/man?/%{name}.?*
> %lang(de) %{_mandir}/de.UTF-8/man?/%{name}.?*
> %lang(fr) %{_mandir}/fr.UTF-8/man?/%{name}.?*

--- wine.spec	2024-02-28 20:14:56.617098338 +0200
+++ wine.spec	2024-03-10 21:30:21.890806835 +0200
@@ -186,8 +186,10 @@ be used for porting Win32 code into nati
 %package -n	%{wine}
 Summary:	WINE Is Not An Emulator - runs MS Windows programs
 Group:		Emulators
+%ifarch x86_64
 Recommends:	%{name}32 = %{epoch}:%{version}-%{release}
-Recommends:       mingw32-wine-gecko = %gecko_version
+%endif
+Recommends: mingw64-wine-gecko = %gecko_version
 %else
 # on 32-bit we always want wine32 package
 Requires:	%{name}32 = %{epoch}:%{version}-%{release}
@@ -200,6 +202,34 @@ Provides:	wine-bin = %{epoch}:%{version}
 Obsoletes:	%{wine}-utils %{wine}-full %{lib_name}-capi %{lib_name}-twain
 Obsoletes:	%{lib_name} <= %{epoch}:%{version}-%{release}
 Recommends:	sane-frontends
+
+Requires(post):     desktop-file-utils
+Requires(postun):   desktop-file-utils
+Requires(post):     desktop-common-data
+Requires(postun):   desktop-common-data
+Requires(preun):    rpm-helper
+Requires(post):     rpm-helper
+%ifarch %{ix86}
+Conflicts:  wine64
+%endif
+%ifarch x86_64
+Conflicts:  wine
+%endif
+
+%ifnarch x86_64 aarch64
+%package -n %{name}32
+Summary:    32-bit support for Wine
+Group:      Emulators
+# This is not an EVR-specific requirement, as otherwise on x86_64 urpmi could
+# resolve the dependency to wine64 even on upgrades, and therefore replace
+# wine+wine32 installation with a wine32+wine64 installation. - Anssi
+Requires:   wine-bin
+# (Anssi) If wine-gecko is not installed, wine pops up a dialog on first
+# start proposing to download wine-gecko from sourceforge, while recommending
+# to use distribution packages instead. Therefore suggest wine-gecko here:
+Recommends: mingw32-wine-gecko = %gecko_version
+%endif
+
 %define dlopenreq() %(F=%{_libdir}/lib%{1}.so;[ -e $F ] && (file $F|grep -q ASCII && grep -o 'lib[^ ]*' $F|sed -e "s/\$/%{mark64}/"||objdump -p $F | grep SONAME | awk '{ print $2 "%{mark64}" }') || echo "wine-missing-buildrequires-on-%{1}")
 # wine dlopen's these, so let's add the dependencies ourself
 # Adding these here is especially important with wine, since wine32 is
@@ -236,17 +266,6 @@ Requires:       %dlopenreq Xxf86vm
 # download pre-built binaries (unlike wine-gecko, same wine-mono works with
 # both wine and wine64):
 Recommends:	wine-mono = %mono_version
-Requires(post):		desktop-file-utils
-Requires(postun):	desktop-file-utils
-Requires(post):		desktop-common-data
-Requires(postun):	desktop-common-data
-Requires(preun):	rpm-helper
-Requires(post):		rpm-helper
-%ifarch %{ix86}
-Conflicts:	%{name}64
-%else
-Conflicts:	%{name}
-%endif
 # (tv) needed by games:
 Requires:  %{mklibname dri-drivers}
 %ifnarch x86_64 aarch64
@@ -273,25 +292,13 @@ Requires:  mingw64-zlib
 %ifarch x86_64 aarch64
 %description -n	%{wine}
 %desc
-
-This package contains the Win64 version of Wine. You need the wine32
-package from the 32-bit repository to be able to run 32-bit applications.
+This package contains the 64-bit version of Wine.
+%ifarch x86_64
+You need the wine32 package from the 32-bit repository
+to be able to run 32-bit applications.
 %endif
 
-%ifnarch x86_64 aarch64
-%package -n	wine32
-Summary:	32-bit support for Wine
-Group:		Emulators
-# This is not an EVR-specific requirement, as otherwise on x86_64 urpmi could
-# resolve the dependency to wine64 even on upgrades, and therefore replace
-# wine+nwine32 installation with a wine32+wine64 installation. - Anssi
-Requires:	%{name}-bin
-Conflicts:	%{name} < 1:1.2-0.rc7.1
-Conflicts:	%{name}64 < 1:1.2-0.rc7.1
-# (Anssi) If wine-gecko is not installed, wine pops up a dialog on first
-# start proposing to download wine-gecko from sourceforge, while recommending
-# to use distribution packages instead. Therefore suggest wine-gecko here:
-Recommends:       mingw64-wine-gecko = %gecko_version
+%else
 
 %description -n	wine32
 Wine is a program which allows running Microsoft Windows programs
@@ -491,7 +498,7 @@ sed -i 's,Exec=wine ,Exec=wine64 ,' %{bu
 mkdir -p %{buildroot}%{_iconsdir}/hicolor/256x256/apps
 tar -Jxf %{SOURCE3} -C %{buildroot}%{_iconsdir}/hicolor/256x256/apps/
 
-%ifarch x86_64 aarch64
+%ifarch x86_64
 cat > README.install.urpmi <<EOF
 This is the Win64 version of Wine. This version can only be used to run
 64-bit Windows applications as is. For running 32-bit Windows applications,
@@ -502,11 +509,6 @@ EOF
 %files -n %{wine}
 %doc ANNOUNCE.md AUTHORS README.md
 %config %{_binfmtdir}/wine.conf
-%ifarch x86_64 aarch64
-%doc README.install.urpmi
-%{_bindir}/%{name}64
-%{_bindir}/%{name}64-preloader
-%endif
 %{_bindir}/winecfg
 %{_bindir}/wineconsole*
 %{_bindir}/wineserver
@@ -522,12 +524,6 @@ EOF
 %{_bindir}/winepath
 %{_bindir}/regsvr32
 %{_bindir}/winefile
-%ifnarch x86_64
-%{_mandir}/man?/%{name}.?*
-%lang(de) %{_mandir}/de.UTF-8/man?/%{name}.?*
-%lang(fr) %{_mandir}/fr.UTF-8/man?/%{name}.?*
-%lang(pl) %{_mandir}/pl.UTF-8/man?/%{name}.?*
-%endif
 %lang(de) %{_mandir}/de.UTF-8/man?/wineserver.?*
 %lang(fr) %{_mandir}/fr.UTF-8/man?/wineserver.?*
 %{_mandir}/man?/wineserver.?*
@@ -551,12 +547,17 @@ EOF
 %{_datadir}/wine/fonts/*
 %{_iconsdir}/hicolor/*/apps/*.png
 
+%ifarch x86_64
+%doc README.install.urpmi
+%endif
+
 %ifnarch x86_64 aarch64
 %files -n wine32
-%{_bindir}/wine
-%ifarch %{ix86} %arm
-%{_bindir}/wine-preloader
 %endif
+%{_bindir}/%{wine}
+%{_bindir}/%{wine}-preloader
+
+%ifnarch x86_64
 %{_mandir}/man?/%{name}.?*
 %lang(de) %{_mandir}/de.UTF-8/man?/%{name}.?*
 %lang(fr) %{_mandir}/fr.UTF-8/man?/%{name}.?*

Actions: View | Diff

Attachments on bug 32972: 14462 | 14463 | 14464 | 14465