From 002aa38b22a7d601050e606e252fb5b563bbc94dcabcb31d4a7e615179bb7603 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@novell.slipkontur.de>
Date: Wed, 17 Oct 2012 11:38:01 +0000
Subject: [PATCH] Accepting request 138474 from
 openSUSE:Factory:Staging:Systemd

- Fix build with new systemd / udev location.
- Change udev rules location with udev > 190

OBS-URL: https://build.opensuse.org/request/show/138474
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=126
---
 bluez-gstreamer.changes |  5 +++++
 bluez-gstreamer.spec    |  3 ++-
 bluez.changes           |  5 +++++
 bluez.spec              | 10 ++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bluez-gstreamer.changes b/bluez-gstreamer.changes
index fdd4700..5ee229c 100644
--- a/bluez-gstreamer.changes
+++ b/bluez-gstreamer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 17 09:18:47 UTC 2012 - fcrozat@suse.com
+
+- Fix build with new systemd / udev location.
+
 -------------------------------------------------------------------
 Fri Jul 20 14:58:35 UTC 2012 - seife+obs@b1-systems.com
 
diff --git a/bluez-gstreamer.spec b/bluez-gstreamer.spec
index bd08790..c8358a5 100644
--- a/bluez-gstreamer.spec
+++ b/bluez-gstreamer.spec
@@ -96,7 +96,8 @@ make %{?_smp_mflags} all V=1
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT/usr/[^l]* $RPM_BUILD_ROOT/[^u]* $RPM_BUILD_ROOT/%{_libdir}/[^g]*
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}/*bluetooth* $RPM_BUILD_ROOT/usr/include
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}/*bluetooth* $RPM_BUILD_ROOT/usr/include 
+rm -rf $RPM_BUILD_ROOT/usr/lib/udev $RPM_BUILD_ROOT/usr/lib/systemd
 rm $RPM_BUILD_ROOT/%{_libdir}/*/*.la
 
 %clean
diff --git a/bluez.changes b/bluez.changes
index fdd4700..64d469a 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 17 08:52:03 UTC 2012 - fcrozat@suse.com
+
+- Change udev rules location with udev > 190
+
 -------------------------------------------------------------------
 Fri Jul 20 14:58:35 UTC 2012 - seife+obs@b1-systems.com
 
diff --git a/bluez.spec b/bluez.spec
index 3c0e14b..7f08fb0 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -68,6 +68,11 @@ Requires:       libbluetooth3 = %{version}
 %define OLD_UDEV 1
 %else
 %define OLD_UDEV 0
+%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
+%define NEW_UDEV 1
+%else
+%define NEW_UDEV 0
+%endif
 %endif
 
 # In openSUSE 11.3 there is upstream compliant CUPS 1.4
@@ -358,8 +363,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/bluetoothd
 #%{_sbindir}/hid2hci
 %{_sbindir}/bccmd
+%if 0%{NEW_UDEV}
+%dir /usr/lib/udev
+/usr/lib/udev/*
+%else
 %dir /lib/udev
 /lib/udev/*
+%endif
 %if 0%{OLD_UDEV}
 %dir %{_sysconfdir}/udev/rules.d
 %config %{_sysconfdir}/udev/rules.d/*