From: Jacek Konieczny Date: Sat, 3 May 2014 10:54:34 +0000 (+0200) Subject: Version: 1.6.2 X-Git-Tag: auto/th/wine-1.6.2-1~3 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=55061442e22beae564938cdcbe1f08caa6b995f3;p=packages%2Fwine.git Version: 1.6.2 build dependencies updated --- diff --git a/wine-gphoto2_bool.patch b/wine-gphoto2_bool.patch new file mode 100644 index 0000000..def7dcd --- /dev/null +++ b/wine-gphoto2_bool.patch @@ -0,0 +1,14 @@ +--- wine-1.6.2.orig/dlls/gphoto2.ds/gphoto2_i.h 2014-01-10 21:37:29.000000000 +0100 ++++ wine-1.6.2/dlls/gphoto2.ds/gphoto2_i.h 2014-05-03 12:30:26.674481549 +0200 +@@ -32,7 +32,11 @@ + #ifdef HAVE_GPHOTO2 + /* Hack for gphoto2, which changes behaviour when WIN32 is set. */ + #undef WIN32 ++#define TRUE 1 ++#define FALSE 0 + #include ++#undef TRUE ++#undef FALSE + #define WIN32 + #endif + diff --git a/wine-wine64_man.patch b/wine-wine64_man.patch index 12f0fde..fc0ad5d 100644 --- a/wine-wine64_man.patch +++ b/wine-wine64_man.patch @@ -1,6 +1,6 @@ -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 +diff -durN wine-1.6.2.orig/loader/wine.de.man.in wine-1.6.2/loader/wine.de.man.in +--- wine-1.6.2.orig/loader/wine.de.man.in 2014-01-10 21:37:29.000000000 +0100 ++++ wine-1.6.2/loader/wine.de.man.in 2014-05-03 12:07:16.337846160 +0200 @@ -1,14 +1,14 @@ .\" -*- nroff -*- -.TH WINE 1 "November 2007" "@PACKAGE_STRING@" "Windows On Unix" @@ -20,19 +20,18 @@ diff -dur wine-1.6.orig/loader/wine.de.man.in wine-1.6/loader/wine.de.man.in .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" +diff -durN wine-1.6.2.orig/loader/wine.fr.man.in wine-1.6.2/loader/wine.fr.man.in +--- wine-1.6.2.orig/loader/wine.fr.man.in 2014-01-10 21:37:29.000000000 +0100 ++++ wine-1.6.2/loader/wine.fr.man.in 2014-05-03 12:07:54.424511977 +0200 +@@ -1,13 +1,13 @@ +-.TH WINE 1 "juillet 2013" "@PACKAGE_STRING@" "Windows sur Unix" ++.TH WINE64 1 "juillet 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 ... ] +-.B wine ++.B wine64 + .IR "programme " [ arguments ] .br -.B wine --help +.B wine64 --help @@ -42,18 +41,18 @@ diff -dur wine-1.6.orig/loader/wine.fr.man.in wine-1.6/loader/wine.fr.man.in .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 +diff -durN wine-1.6.2.orig/loader/wine.man.in wine-1.6.2/loader/wine.man.in +--- wine-1.6.2.orig/loader/wine.man.in 2014-01-10 21:37:29.000000000 +0100 ++++ wine-1.6.2/loader/wine.man.in 2014-05-03 12:08:34.081177747 +0200 @@ -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 ... ] +-.B wine ++.B wine64 + .IR "program " [ arguments ] .br -.B wine --help +.B wine64 --help @@ -63,9 +62,9 @@ diff -dur wine-1.6.orig/loader/wine.man.in wine-1.6/loader/wine.man.in .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 +diff -durN wine-1.6.2.orig/loader/wine.pl.man.in wine-1.6.2/loader/wine.pl.man.in +--- wine-1.6.2.orig/loader/wine.pl.man.in 2014-01-10 21:37:29.000000000 +0100 ++++ wine-1.6.2/loader/wine.pl.man.in 2014-05-03 12:07:16.337846160 +0200 @@ -1,14 +1,14 @@ .\" -*- nroff -*- -.TH WINE 1 "October 2005" "@PACKAGE_STRING@" "Windows On Unix" diff --git a/wine.spec b/wine.spec index 2371682..7760e0e 100644 --- a/wine.spec +++ b/wine.spec @@ -31,19 +31,19 @@ Summary(es.UTF-8): Ejecuta programas Windows en Linux Summary(pl.UTF-8): Program pozwalający uruchamiać aplikacje Windows Summary(pt_BR.UTF-8): Executa programas Windows no Linux Name: wine -Version: 1.6 -Release: 5 +Version: 1.6.2 +Release: 1 Epoch: 1 License: LGPL Group: Applications/Emulators Source0: http://downloads.sourceforge.net/wine/%{name}-%{version}.tar.bz2 -# Source0-md5: 47cf1e121d395e9c8ca1a4ab88f1e658 +# Source0-md5: 0f6c56f86befe38e219090915f81f48a Source1: http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86.msi # Source1-md5: 432eb3a2d05c3f07df67864f53c87c60 Source2: http://downloads.sourceforge.net/wine/%{name}_gecko-%{gecko_ver}-x86_64.msi # Source2-md5: 580bbabde1ec99ba9caa439c2dbca3f6 Source3: %{name}-uninstaller.desktop -Patch0: %{name}-bison3.patch +Patch0: %{name}-gphoto2_bool.patch Patch1: %{name}-makedep.patch Patch2: %{name}-ncurses.patch Patch4: %{name}-disable-valgrind.patch @@ -71,9 +71,9 @@ BuildRequires: fslint BuildRequires: gettext-devel BuildRequires: giflib-devel BuildRequires: gnutls-devel -%{?with_gstreamer:BuildRequires: gstreamer-plugins-base-devel} +%{?with_gstreamer:BuildRequires: gstreamer0.10-plugins-base-devel} BuildRequires: icoutils -BuildRequires: lcms-devel +BuildRequires: lcms2-devel BuildRequires: libgphoto2-devel BuildRequires: libgsm-devel BuildRequires: libjpeg-devel