Hello community,
here is the log from the commit of package gpsd for openSUSE:Factory checked in
at 2012-10-23 21:24:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpsd (Old)
and /work/SRC/openSUSE:Factory/.gpsd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsd", Maintainer is "jreu...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpsd/gpsd.changes 2012-05-08
06:45:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gpsd.new/gpsd.changes 2012-10-23
21:24:40.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Oct 17 11:48:10 UTC 2012 - fcro...@suse.com
+
+- Fix build and adapt udev rule to new udev location.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpsd.spec ++++++
--- /var/tmp/diff_new_pack.DUFcbd/_old 2012-10-23 21:24:45.000000000 +0200
+++ /var/tmp/diff_new_pack.DUFcbd/_new 2012-10-23 21:24:45.000000000 +0200
@@ -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 @@
%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 @@
%{_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
++++++ rules.gpsd ++++++
--- /var/tmp/diff_new_pack.DUFcbd/_old 2012-10-23 21:24:45.000000000 +0200
+++ /var/tmp/diff_new_pack.DUFcbd/_new 2012-10-23 21:24:45.000000000 +0200
@@ -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"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
