[packages/wine] rename wine man page on x86_64
jajcus
jajcus at pld-linux.org
Sun Oct 27 16:34:28 CET 2013
commit f6cf693bfef52e2378757ea013d401bb67c4a508
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sun Oct 27 16:31:07 2013 +0100
rename wine man page on x86_64
This way it will match the binary and will not conflict with the i686
package on mulitarch systems.
wine-wine64_man.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++
wine.spec | 17 ++++++++++
2 files changed, 104 insertions(+)
---
diff --git a/wine.spec b/wine.spec
index a5a7d34..052182a 100644
--- a/wine.spec
+++ b/wine.spec
@@ -50,6 +50,7 @@ Patch4: %{name}-disable-valgrind.patch
Patch5: %{name}-ca_certificates.patch
Patch6: %{name}-manpaths.patch
Patch7: desktop.patch
+Patch8: %{name}-wine64_man.patch
URL: http://www.winehq.org/
BuildRequires: OpenAL-devel >= 1.1
BuildRequires: OpenGL-GLU-devel
@@ -267,6 +268,9 @@ Sterownik ALSA dla implementacji mm.dll (systemu multimediów) w Wine.
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%ifarch %{x8664}
+%patch8 -p1
+%endif
%build
icotool -x --width=32 --height=32 --bit-depth=32 -o . dlls/user32/resources/oic_winlogo.ico
@@ -373,6 +377,12 @@ for p in $programs; do
mv -f files.so. files.so
done
+%ifarch %{x8664}
+for langdir in "" de/ fr/ pl/ ; do
+mv $RPM_BUILD_ROOT%{_mandir}/${langdir}man1/{wine,wine64}.1
+done
+%endif
+
install -d $RPM_BUILD_ROOT%{_winedir}/gecko
%ifnarch %{x8664}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_winedir}/gecko
@@ -454,10 +464,17 @@ fi
%ifarch %{ix86}
%{_libdir}/wine/fakedlls/*.vxd
%endif
+%ifnarch %{x8664}
%{_mandir}/man1/wine.1*
%lang(de) %{_mandir}/de/man1/wine.1*
%lang(fr) %{_mandir}/fr/man1/wine.1*
%lang(pl) %{_mandir}/pl/man1/wine.1*
+%else
+%{_mandir}/man1/wine64.1*
+%lang(de) %{_mandir}/de/man1/wine64.1*
+%lang(fr) %{_mandir}/fr/man1/wine64.1*
+%lang(pl) %{_mandir}/pl/man1/wine64.1*
+%endif
%{_mandir}/man1/msiexec.1*
%{_mandir}/man1/wineboot.1*
%{_mandir}/man1/winecfg.1*
diff --git a/wine-wine64_man.patch b/wine-wine64_man.patch
new file mode 100644
index 0000000..12f0fde
--- /dev/null
+++ b/wine-wine64_man.patch
@@ -0,0 +1,87 @@
+diff -dur wine-1.6.orig/loader/wine.de.man.in wine-1.6/loader/wine.de.man.in
+--- wine-1.6.orig/loader/wine.de.man.in 2013-07-18 19:57:36.000000000 +0200
++++ wine-1.6/loader/wine.de.man.in 2013-10-27 16:00:56.166403298 +0100
+@@ -1,14 +1,14 @@
+ .\" -*- nroff -*-
+-.TH WINE 1 "November 2007" "@PACKAGE_STRING@" "Windows On Unix"
++.TH WINE64 1 "November 2007" "@PACKAGE_STRING@" "Windows On Unix"
+ .SH NAME
+ wine \- Windows-Programme auf Unix-Systemen ausführen
+ .SH ÜBERSICHT
+-.BI "wine " Programm
++.BI "wine64 " Programm
+ [Argumente ... ]
+ .br
+-.B wine --help
++.B wine64 --help
+ .br
+-.B wine --version
++.B wine64 --version
+ .PP
+ Für das Übergeben von Kommandos an Windows-Programme siehe den
+ Abschnitt
+diff -dur wine-1.6.orig/loader/wine.fr.man.in wine-1.6/loader/wine.fr.man.in
+--- wine-1.6.orig/loader/wine.fr.man.in 2013-07-18 19:57:36.000000000 +0200
++++ wine-1.6/loader/wine.fr.man.in 2013-10-27 16:01:15.983990116 +0100
+@@ -1,14 +1,14 @@
+ .\" -*- nroff -*-
+-.TH WINE 1 "juin 2013" "@PACKAGE_STRING@" "Windows sur Unix"
++.TH WINE64 1 "juin 2013" "@PACKAGE_STRING@" "Windows sur Unix"
+ .SH NOM
+ wine \- exécuter des programmes Windows sur Unix
+ .SH SYNOPSIS
+-.BI "wine " programme
++.BI "wine64 " programme
+ [arguments ... ]
+ .br
+-.B wine --help
++.B wine64 --help
+ .br
+-.B wine --version
++.B wine64 --version
+ .PP
+ Pour des instructions sur le passage d'arguments aux programmes Windows, veuillez lire la section
+ .B
+diff -dur wine-1.6.orig/loader/wine.man.in wine-1.6/loader/wine.man.in
+--- wine-1.6.orig/loader/wine.man.in 2013-07-18 19:57:36.000000000 +0200
++++ wine-1.6/loader/wine.man.in 2013-10-27 16:00:15.187833961 +0100
+@@ -1,13 +1,13 @@
+-.TH WINE 1 "July 2013" "@PACKAGE_STRING@" "Windows On Unix"
++.TH WINE64 1 "July 2013" "@PACKAGE_STRING@" "Windows On Unix"
+ .SH NAME
+ wine \- run Windows programs on Unix
+ .SH SYNOPSIS
+-.BI "wine " program
++.BI "wine64 " program
+ [arguments ... ]
+ .br
+-.B wine --help
++.B wine64 --help
+ .br
+-.B wine --version
++.B wine64 --version
+ .PP
+ For instructions on passing arguments to Windows programs, please see the
+ .B
+diff -dur wine-1.6.orig/loader/wine.pl.man.in wine-1.6/loader/wine.pl.man.in
+--- wine-1.6.orig/loader/wine.pl.man.in 2013-07-18 19:57:36.000000000 +0200
++++ wine-1.6/loader/wine.pl.man.in 2013-10-27 16:00:32.485303762 +0100
+@@ -1,14 +1,14 @@
+ .\" -*- nroff -*-
+-.TH WINE 1 "October 2005" "@PACKAGE_STRING@" "Windows On Unix"
++.TH WINE64 1 "October 2005" "@PACKAGE_STRING@" "Windows On Unix"
+ .SH NAZWA
+ wine \- uruchamiaj programy Windowsowe na Uniksie
+ .SH SKŁADNIA
+-.BI "wine " program
++.BI "wine64 " program
+ [opcje ... ]
+ .br
+-.B wine --help
++.B wine64 --help
+ .br
+-.B wine --version
++.B wine64 --version
+ .PP
+ Informacji na temat przekazywania opcji programom Windowsowym szukaj w rozdziale
+ .B
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wine.git/commitdiff/f6cf693bfef52e2378757ea013d401bb67c4a508
More information about the pld-cvs-commit
mailing list