From a81f236cb2cb095f773a71626486fe299bfeda7cbb9bf692ad6f1be8e90234b5 Mon Sep 17 00:00:00 2001
From: Angelos Tzotsos <tzotsos@gmail.com>
Date: Mon, 22 Oct 2012 16:01:21 +0000
Subject: [PATCH] Accepting request 138917 from
 openSUSE:Factory:Staging:Systemd

fix build with new udev location

OBS-URL: https://build.opensuse.org/request/show/138917
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gpsd?expand=0&rev=75
---
 gpsd.changes |  5 +++++
 gpsd.spec    | 18 ++++++++++++------
 rules.gpsd   | 14 +++++++-------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/gpsd.changes b/gpsd.changes
index 14acb34..cc4c769 100644
--- a/gpsd.changes
+++ b/gpsd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 17 11:48:10 UTC 2012 - fcrozat@suse.com
+
+- Fix build and adapt udev rule to new udev location.
+
 -------------------------------------------------------------------
 Mon Apr 23 11:16:40 UTC 2012 - opensuse@dstoecker.de
 
diff --git a/gpsd.spec b/gpsd.spec
index 5f1b42f..fb8613f 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -16,6 +16,12 @@
 #
 
 
+%if %( echo `rpm -q --queryformat %%{version} udev` ) > 190
+%define _udevdir /usr/lib/udev/
+%else
+%define _udevdir /lib/udev/
+%endif
+
 Name:           gpsd
 Summary:        Service daemon for mediating access to a GPS
 License:        BSD-3-Clause
@@ -224,12 +230,12 @@ scons prefix=%{_prefix} libdir=%{_libdir} strip=False
 
 %install
 DESTDIR=%{buildroot} scons prefix=%{_prefix} libdir=%{_libdir} strip=False install
-install -d -m 755 %{buildroot}/lib/udev
-install -d -m 755 %{buildroot}/lib/udev/rules.d
+install -d -m 755 %{buildroot}%{_udevdir}
+install -d -m 755 %{buildroot}%{_udevdir}/rules.d
 install -d -m 755 %{buildroot}/var/adm/fillup-templates
 install -d -m 755 %{buildroot}%{_datadir}/{applications,pixmaps}
-install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d/51-gpsd.rules
-install -m 755 %{SOURCE2} %{buildroot}/lib/udev/gpsd.sh
+install -m 644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/51-gpsd.rules
+install -m 755 %{SOURCE2} %{buildroot}%{_udevdir}/gpsd.sh
 install -m 644 %{SOURCE3} %{buildroot}/var/adm/fillup-templates
 if [ -f %{buildroot}%{python_sitearch}/*.egg-info ] ; then
   rm -f %{buildroot}%{python_sitearch}/*.egg-info
@@ -270,8 +276,8 @@ rm -rf %{buildroot}
 %{_mandir}/man?/gpsd.*
 %{_mandir}/man?/gpsdctl.*
 %{_mandir}/man?/gpsctl.*
-/lib/udev/gpsd.sh
-/lib/udev/rules.d/*
+%{_udevdir}/gpsd.sh
+%{_udevdir}/rules.d/*
 %{_sbindir}/gpsd
 %{_sbindir}/gpsdctl
 %{_bindir}/gpsctl
diff --git a/rules.gpsd b/rules.gpsd
index b613fc2..0a56960 100644
--- a/rules.gpsd
+++ b/rules.gpsd
@@ -1,21 +1,21 @@
 SUBSYSTEM != "tty", GOTO="gpsd_end"
 
 ACTION != "remove, GOTO="gpsd_add"
-KERNEL=="ttyUSB*", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", RUN="gpsd.sh"
 
 LABEL="gpsd_add"
 ACTION != "add", GOTO="gpsd_end"
 
 # "Prolific Technology 2303 (commonly in tandem with SiRF chips)"
-KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", RUN="gpsd.sh"
 # "FTDI 8U232AM"
-KERNEL=="ttyUSB*", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", RUN="gpsd.sh"
 # "Cypress M8/CY7C64013 (DeLorme uses these)"
-KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", RUN="/lib/udev/gpsd.sh"
-KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0200", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", RUN="gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="1163", ATTR{idProduct}=="0200", RUN="gpsd.sh"
 # "PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)"
-KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", RUN="gpsd.sh"
 # SiRF Star III 20ch Gmouse GPS (a.k.a Cygnal Integrated Products, Inc.)
-KERNEL=="ttyUSB*", ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", RUN="/lib/udev/gpsd.sh"
+KERNEL=="ttyUSB*", ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", RUN="gpsd.sh"
 
 LABEL="gpsd_end"