From c1523b4fbea131ea84524e7667ddbf290ba08e3589497c8f118540800b25f9d4 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@novell.slipkontur.de>
Date: Wed, 14 Apr 2010 14:42:46 +0000
Subject: [PATCH] Accepting request 37938 from home:jsmeix:branches:Base:System

Copy from home:jsmeix:branches:Base:System/bluez via accept of submit request 37938 revision 3.
Request was accepted with message:
Looks good. I trust you on that, Johannes ;)

OBS-URL: https://build.opensuse.org/request/show/37938
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=46
---
 bluez.changes |  7 +++++++
 bluez.spec    | 23 ++++++++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/bluez.changes b/bluez.changes
index ceadaab..baf6af7 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 14 15:32:51 CEST 2010 - jsmeix@suse.de
+
+- In openSUSE 11.3 there is upstream compliant CUPS 1.4
+  which means to have a fixed "/usr/lib/cups/" directory
+  on all platforms (see Novell/Suse Bugzilla bnc#575544).
+
 -------------------------------------------------------------------
 Fri Mar 26 07:20:13 UTC 2010 - seife@opensuse.org
 
diff --git a/bluez.spec b/bluez.spec
index 52ace52..7401179 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -49,6 +49,14 @@ Requires:       libbluetooth3 = %{version}
 %else
 %define OLD_UDEV 0
 %endif
+# In openSUSE 11.3 there is upstream compliant CUPS 1.4
+# which means to have a fixed "/usr/lib/cups/" directory
+# on all platforms (see Novell/Suse Bugzilla bnc#575544):
+%if 0%{?suse_version} > 1120
+%define cups_lib_dir %{_prefix}/lib/cups
+%else
+%define cups_lib_dir %{_libdir}/cups
+%endif
 
 %description
 The Bluetooth stack for Linux.
@@ -227,6 +235,15 @@ install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluez-coldpl
 install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth
 install --mode=0755 -D %{S:4} $RPM_BUILD_ROOT/lib/udev/bluetooth.sh
 install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
+# In openSUSE 11.3 there is upstream compliant CUPS 1.4
+# which means to have a fixed "/usr/lib/cups/" directory
+# on all platforms (see Novell/Suse Bugzilla bnc#575544):
+if ! test -e %{buildroot}%{cups_lib_dir}/backend/bluetooth
+then if test -e %{buildroot}%{_libdir}/cups/backend/bluetooth
+     then mkdir -p %{buildroot}%{cups_lib_dir}/backend
+          mv %{buildroot}%{_libdir}/cups/backend/bluetooth %{buildroot}%{cups_lib_dir}/backend/bluetooth
+     fi
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -307,9 +324,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cups
 %defattr(-,root,root)
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/backend
-%{_libdir}/cups/backend/bluetooth
+%dir %{cups_lib_dir}
+%dir %{cups_lib_dir}/backend
+%{cups_lib_dir}/backend/bluetooth
 #%doc %{_defaultdocdir}/bluez-cups
 
 %files test