From 784bf3e5ff345479821e707dab68fde59c03f07f0d4cdc6dfc800d33ff5a10b8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Jun 2011 11:30:14 +0000 Subject: [PATCH] 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.