[gimp] don't use HAL from F-16/RHEL-7 on

[Nils Philippsen]

commit 4d51bcd20b223dfc2d529565595f3bd5e7178641
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Mar 15 17:53:51 2011 +0100

    don't use HAL from F-16/RHEL-7 on

 gimp.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/gimp.spec b/gimp.spec
index 5d05967..5f69c0e 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -19,6 +19,13 @@
 %bcond_without gutenprint
 # convenience: install convenience symlinks
 %bcond_without convenience
+# hal:         use HAL to discover special input devices
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
+# don't use HAL from F-16/RHEL7 on
+%bcond_with hal
+%else
+%bcond_without hal
+%endif
 # aalib:       build with AAlib (ASCII art gfx library)
 %if 0%{?rhel} != 0
 # don't use aalib on RHEL
@@ -31,7 +38,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.11
-Release:        8%{?dist}
+Release:        9%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -62,7 +69,9 @@ BuildRequires:  gnome-vfs2-devel >= 2.10.0
 BuildRequires:  gtk2-devel >= 2.12.5
 BuildRequires:  gtk-doc >= 1.0
 BuildRequires:  gtkhtml2-devel >= 2.0.0
+%if %{with hal}
 BuildRequires:  hal-devel >= 0.5.7
+%endif
 BuildRequires:  libexif-devel >= 0.6.15
 BuildRequires:  libgnomeui-devel >= 2.10.0
 BuildRequires:  libjpeg-devel
@@ -206,6 +215,7 @@ build static libs:                        %{with static}
 build internal print plugin:              %{with print}
 include convenience symlinks:             %{with convenience}
 build the print plugin:                   %{with print}
+use HAL:                                  %{with hal}
 %if ! %{with print}
 prefer gutenprint over (external) gimp-print plugin:
                                           %{with gutenprint}
@@ -266,6 +276,11 @@ LDFLAGS='-pie'
 %else
     --without-aa \
 %endif
+%if %{with hal}
+    --with-hal \
+%else
+    --without-hal \
+%endif
 %ifos linux
     --with-linux-input \
 %endif
@@ -488,6 +503,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Mar 15 2011 Nils Philippsen <nils at redhat.com> - 2:2.6.11-9
+- don't use HAL from F-16/RHEL-7 on
+
 * Sun Mar 13 2011 Marek Kasik <mkasik at redhat.com> - 2:2.6.11-8
 - Rebuild (poppler-0.16.3)