From bbbdab57ae6671f3ae4dcbadcc49ceead69e24e5 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 19:26:59 +0100 Subject: [PATCH] fix man pages conflicts when 32 and 64 bits wine-commons cohexist [release 1.7.41-2mamba;Fri May 01 2015] --- wine.spec | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/wine.spec b/wine.spec index d00b037..bf387fb 100644 --- a/wine.spec +++ b/wine.spec @@ -5,7 +5,7 @@ %define wine_patchset_date 20140427 Name: wine Version: 1.7.41 -Release: 1mamba +Release: 2mamba Epoch: 3 Summary: An open source implementation of the Windows API on top of X and Unix Group: Applications/Emulators @@ -180,6 +180,8 @@ Header, include files and library definition files for developing applications w %prep %setup -q -n %{name}-%{version} +#-D -T +#:<< _EOF #-a41 %if "%{version}" != "%{WINE_GECKO_CHECKED_FOR_VERSION}" echo "ERROR: please check if Wine Gecko is latest available at" @@ -192,6 +194,7 @@ cat patches/*.patch | patch -p1 %endif %build +#:<< _EOF %configure \ --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir}/wine \ @@ -326,6 +329,10 @@ chrpath --delete %{buildroot}%{_bindir}/wmc # remove unpackaged files 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 +%endif + %pre desktop /usr/sbin/groupadd -g 65007 wine >/dev/null 2>&1 || : service wine stop >/dev/null 2>&1 || : @@ -364,6 +371,15 @@ 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 +%{_mandir}/pl.UTF-8/man1/wine.1* +%{_mandir}/de.UTF-8/man1/wine.1* +%{_mandir}/fr.UTF-8/man1/wine.1* +%{_mandir}/man1/wine.1* %endif %doc COPYING.LIB LICENSE @@ -389,10 +405,26 @@ exit 0 %{_datadir}/wine/gecko/wine_gecko-*.msi %dir %{_datadir}/wine/mono %{_datadir}/wine/mono/wine-mono-%{wine_mono_ver}.msi -%{_mandir}/man?/* -%{_mandir}/de.UTF-8/man1/wine* -%{_mandir}/fr.UTF-8/man1/wine* -%{_mandir}/pl.UTF-8/man1/wine* +%{_mandir}/man1/msiexec.1* +%{_mandir}/man1/notepad.1* +%{_mandir}/man1/regedit.1* +%{_mandir}/man1/regsvr32.1* +%{_mandir}/man1/wineboot.1* +%{_mandir}/man1/winecfg.1* +%{_mandir}/man1/wineconsole.1* +%{_mandir}/man1/winedbg.1* +%{_mandir}/man1/winefile.1* +%{_mandir}/man1/winemine.1* +%{_mandir}/man1/winepath.1* +%{_mandir}/man1/wineserver.1* +%{_mandir}/de.UTF-8/man1/wineserver.1* +%{_mandir}/fr.UTF-8/man1/wineserver.1* + + +#%{_mandir}/man?/* +#%{_mandir}/de.UTF-8/man1/wine* +#%{_mandir}/fr.UTF-8/man1/wine* +#%{_mandir}/pl.UTF-8/man1/wine* %files fonts %defattr(-,root,root) @@ -447,10 +479,24 @@ exit 0 %{_libdir}/libwine.so %{_libdir}/wine/*.a %{_libdir}/wine/*.def +%{_mandir}/man1/winebuild.1* +%{_mandir}/man1/winecpp.1* +%{_mandir}/man1/winedump.1* +%{_mandir}/man1/wineg++.1* +%{_mandir}/man1/winegcc.1* +%{_mandir}/man1/widl.1* +%{_mandir}/man1/winemaker.1* +%{_mandir}/man1/wmc.1* +%{_mandir}/man1/wrc.1* +%{_mandir}/de.UTF-8/man1/winemaker.1* +%{_mandir}/fr.UTF-8/man1/winemaker.1* %doc ANNOUNCE AUTHORS README %doc documentation/README.* %changelog +* Fri May 01 2015 Silvan Calarco 1.7.41-2mamba +- fix man pages conflicts when 32 and 64 bits wine-commons cohexist + * Thu Apr 30 2015 Automatic Build System 1.7.41-1mamba - automatic version update by autodist