From 784bf3e5ff345479821e707dab68fde59c03f07f0d4cdc6dfc800d33ff5a10b8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Jun 2011 11:30:14 +0000 Subject: [PATCH 1/3] Accepting request 74787 from home:lnussel:branches:Emulators - make hal support optional, default off (bnc#697035) OBS-URL: https://build.opensuse.org/request/show/74787 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=90 --- wine.changes | 5 +++++ wine.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/wine.changes b/wine.changes index dc86b03..f15cf86 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 28 13:24:29 UTC 2011 - lnussel@suse.de + +- make hal support optional, default off (bnc#697035) + ------------------------------------------------------------------- Fri Jun 10 21:00:29 CEST 2011 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 6ede171..2efc282 100644 --- a/wine.spec +++ b/wine.spec @@ -15,10 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - +%bcond_with hal Name: wine -BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libv4l-devel libxslt-devel ncurses-devel openal-soft-devel openldap2-devel prelink update-desktop-files valgrind-devel +BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libv4l-devel libxslt-devel ncurses-devel openal-soft-devel openldap2-devel prelink update-desktop-files valgrind-devel +%if %{with hal} +BuildRequires: hal-devel +%endif %if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel %else @@ -79,7 +82,7 @@ Group: System/Emulators/PC # requires either 32bit or 64bit wine Requires: wine = %version # lib dependencies that are dynamically loaded -Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libhal.so.1 libncurses.so.6 libfreetype.so.6 libcrypto.so.1.0.0 libssl.so.1.0.0 libfontconfig.so.1 libcups.so.2 libgnutls.so.26 libpng14.so.14 +Requires: libXcursor.so.1 libXi.so.6 libXxf86vm.so.1 libXrender.so.1 libXrandr.so.2 libXinerama.so.1 libXcomposite.so.1 libxslt.so.1 libncurses.so.6 libfreetype.so.6 libcrypto.so.1.0.0 libssl.so.1.0.0 libfontconfig.so.1 libcups.so.2 libgnutls.so.26 libpng14.so.14 %description 32bit This package contains the 32bit runtime environmnent (libraries, DLLs, EXEs) of Wine. From 42178499628fee2dc436fd1b56982ea4fab14f8930ec396c54d284ec10d02817 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Jun 2011 11:31:51 +0000 Subject: [PATCH 2/3] - fixed pl man path OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=91 --- wine.changes | 5 +++++ wine.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/wine.changes b/wine.changes index f15cf86..89f5184 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 29 13:31:38 CEST 2011 - meissner@suse.de + +- fixed pl man path + ------------------------------------------------------------------- Tue Jun 28 13:24:29 UTC 2011 - lnussel@suse.de diff --git a/wine.spec b/wine.spec index 2efc282..a6673d6 100644 --- a/wine.spec +++ b/wine.spec @@ -137,6 +137,7 @@ install -m 0755 %SOURCE1 $RPM_BUILD_ROOT/usr/bin/ install -m 0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/ mv $RPM_BUILD_ROOT/%{_mandir}/de.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/de mv $RPM_BUILD_ROOT/%{_mandir}/fr.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/fr +mv $RPM_BUILD_ROOT/%{_mandir}/pl.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/pl tar xjf %{SOURCE5} # Copied from Ubuntu Wine out of debian.diff # https://launchpad.net/~ubuntu-wine/+archive/ppa/+packages @@ -197,6 +198,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/wine.1* %doc %{_mandir}/man1/winedbg.1* %doc %{_mandir}/man1/wineserver.1* +%doc %dir %doc %{_mandir}/pl +%doc %dir %doc %{_mandir}/pl/man1 %doc %{_mandir}/*/man1/wine.1* %doc %{_mandir}/*/man1/wineserver.1* %doc %{_mandir}/man1/msiexec.1.* From 6009a053c62b622521136c61c3b40b157a4663d31deb20fe8c2c7fda15aff68c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Jun 2011 14:48:48 +0000 Subject: [PATCH 3/3] - Updated to 1.3.23 development snapshot - Support for stubless COM proxies on x86-64. - Builtin dxdiag now outputs real information. - Monochrome bitmap format in the DIB engine. - Beginnings of a true shell Explorer builtin. - A number of new D3DX9 functions. - More support for Indic text shaping. - Various bug fixes. OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=92 --- wine-1.3.22.tar.bz2 | 3 --- wine-1.3.23.tar.bz2 | 3 +++ wine.changes | 12 ++++++++++++ wine.spec | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 wine-1.3.22.tar.bz2 create mode 100644 wine-1.3.23.tar.bz2 diff --git a/wine-1.3.22.tar.bz2 b/wine-1.3.22.tar.bz2 deleted file mode 100644 index 562f362..0000000 --- a/wine-1.3.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dabbbe098de256370ee3d57076394dd76bfbafd5ba69bb3f5bbbb0eabaac6400 -size 19394217 diff --git a/wine-1.3.23.tar.bz2 b/wine-1.3.23.tar.bz2 new file mode 100644 index 0000000..9b44c6a --- /dev/null +++ b/wine-1.3.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17fc85b4d3edde123768f069e9f061bf60d87efa7a607633fb435a4388ea5519 +size 19475016 diff --git a/wine.changes b/wine.changes index 89f5184..62a0eb1 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jun 29 16:46:15 CEST 2011 - meissner@suse.de + +- Updated to 1.3.23 development snapshot + - Support for stubless COM proxies on x86-64. + - Builtin dxdiag now outputs real information. + - Monochrome bitmap format in the DIB engine. + - Beginnings of a true shell Explorer builtin. + - A number of new D3DX9 functions. + - More support for Indic text shaping. + - Various bug fixes. + ------------------------------------------------------------------- Wed Jun 29 13:31:38 CEST 2011 - meissner@suse.de diff --git a/wine.spec b/wine.spec index a6673d6..c5e56b7 100644 --- a/wine.spec +++ b/wine.spec @@ -33,7 +33,7 @@ BuildRequires: gstreamer-0_10-plugins-base-devel License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.3.22 +Version: 1.3.23 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com