From 4b89a97bba6abfedb4b01160f25b06f8dddac4179e817fa643420494aa3734a0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 4 Dec 2012 09:28:40 +0000 Subject: [PATCH] Accepting request 143316 from home:dimstar:branches:GNOME:Factory - Move udev rules.d files to the right location: + Add pkgconfig(udev) BuildRequires. + Define _udevdir based on udevdir variable in udev.pc + Fix install section to make use of _udevdir. OBS-URL: https://build.opensuse.org/request/show/143316 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=116 --- gnome-bluetooth.changes | 8 ++++++++ gnome-bluetooth.spec | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 4fdf7b9..634a9be 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 27 18:56:28 UTC 2012 - dimstar@opensuse.org + +- Move udev rules.d files to the right location: + + Add pkgconfig(udev) BuildRequires. + + Define _udevdir based on udevdir variable in udev.pc + + Fix install section to make use of _udevdir. + ------------------------------------------------------------------- Thu Nov 15 19:44:59 UTC 2012 - dimstar@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index e31d95e..305182a 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -36,6 +36,7 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(gtk+-3.0) >= 2.90.7 BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(nautilus-sendto) +BuildRequires: pkgconfig(udev) %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common BuildRequires: gtk-doc @@ -51,6 +52,7 @@ Provides: bluez-gnome = 1.8 Obsoletes: bluez-gnome < 1.8 BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires +%define _udevdir %(pkg-config --variable udevdir udev) %description The gnome-bluetooth package contains graphical utilities to setup, @@ -138,7 +140,7 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %suse_update_desktop_file bluetooth-wizard %find_lang %{name}2 %{?no_lang_C} %find_lang %{name} %{?no_lang_C} %{name}2.lang -install -m0644 -D %{SOURCE1} %{buildroot}/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules +install -m0644 -D %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/61-gnome-bluetooth-rfkill.rules %fdupes %{buildroot} %clean @@ -168,9 +170,7 @@ rm -rf %{buildroot} %defattr(-, root, root) %doc AUTHORS COPYING NEWS README %doc %{_datadir}/help/C/%{name}/ -%dir /lib/udev -%dir /lib/udev/rules.d -/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules +%{_udevdir}/rules.d/61-gnome-bluetooth-rfkill.rules %{_bindir}/bluetooth-* %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop %{_datadir}/applications/bluetooth-sendto.desktop