rpms/gpsd/devel gpsd-2.95-hotplugvars.patch, NONE, 1.1 gpsd-2.95-silentmake.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 gpsd.spec, 1.35, 1.36 sources, 1.10, 1.11 gpsd-logo.png, 1.1, NONE gpsd.hotplug.wrapper, 1.1, NONE xgps.desktop, 1.3, NONE xgpsspeed.desktop, 1.3, NONE
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Jul 15 15:49:28 UTC 2010
Author: mlichvar
Update of /cvs/pkgs/rpms/gpsd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20390
Modified Files:
.cvsignore gpsd.spec sources
Added Files:
gpsd-2.95-hotplugvars.patch gpsd-2.95-silentmake.patch
Removed Files:
gpsd-logo.png gpsd.hotplug.wrapper xgps.desktop
xgpsspeed.desktop
Log Message:
- update to 2.95
- add /usr/sbin to PATH in gpsd.hotplug.wrapper
- pass sysconfig variables to gpsd started from udev
- enable libusb support
gpsd-2.95-hotplugvars.patch:
gpsd.hotplug.wrapper | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--- NEW FILE gpsd-2.95-hotplugvars.patch ---
diff -up gpsd-2.95/gpsd.hotplug.wrapper.hotplugvars gpsd-2.95/gpsd.hotplug.wrapper
--- gpsd-2.95/gpsd.hotplug.wrapper.hotplugvars 2010-07-12 02:40:22.000000000 +0200
+++ gpsd-2.95/gpsd.hotplug.wrapper 2010-07-15 16:48:08.000000000 +0200
@@ -3,20 +3,25 @@
# This file is Copyright (c) 2010 by the GPSD project
# BSD terms apply: see the file COPYING in the distribution root for details.
+PATH=/usr/sbin:$PATH
+export PATH
+
if [ -r /etc/default/gpsd ]; then
. /etc/default/gpsd
elif [ -r /etc/sysconfig/gpsd ]; then
. /etc/sysconfig/gpsd
+ GPSD_OPTIONS=$OPTIONS
+ GPSD_SOCKET=$CONTROL_SOCKET
fi
-if [ -n $GPSD_OPTIONS ]; then
+if [ -n "$GPSD_OPTIONS" ]; then
export GPSD_OPTIONS
fi
-if [ -n $GPSD_SOCKET ]; then
+if [ -n "$GPSD_SOCKET" ]; then
export GPSD_SOCKET
fi
-if [ -n $USBAUTO ]; then
+if [ -n "$USBAUTO" ]; then
[ "$USBAUTO" = "true" ] || exit 0
fi
gpsd-2.95-silentmake.patch:
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gpsd-2.95-silentmake.patch ---
diff -up gpsd-2.95/setup.py.silentmake gpsd-2.95/setup.py
--- gpsd-2.95/setup.py.silentmake 2010-06-11 10:38:24.000000000 +0200
+++ gpsd-2.95/setup.py 2010-07-14 17:23:12.000000000 +0200
@@ -57,7 +57,7 @@ if not 'clean' in sys.argv:
gpspacket_sources = ["gpspacket.c", "packet.c", "isgps.c",
"driver_rtcm2.c", "strl.c", "hex.c", "crc24q.c"]
include_dirs = [ os.path.realpath(os.path.dirname(__file__)) ]
-version_out = os.popen(MAKE + " -s version")
+version_out = os.popen(MAKE + " --no-print-directory version")
version = version_out.read()
print(version)
if version_out.close():
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 6 May 2010 16:14:04 -0000 1.10
+++ .cvsignore 15 Jul 2010 15:49:28 -0000 1.11
@@ -1 +1 @@
-gpsd-2.94.tar.gz
+gpsd-2.95.tar.gz
Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- gpsd.spec 6 May 2010 16:14:04 -0000 1.35
+++ gpsd.spec 15 Jul 2010 15:49:28 -0000 1.36
@@ -1,7 +1,7 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: gpsd
-Version: 2.94
+Version: 2.95
Release: 1%{?dist}
Summary: Service daemon for mediating access to a GPS
@@ -9,17 +9,14 @@ Group: System Environment/Daemons
License: BSD
URL: http://developer.berlios.de/projects/gpsd/
Source0: http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
-Source1: xgps.desktop
-Source2: xgpsspeed.desktop
-Source3: gpsd-logo.png
Source10: gpsd.init
Source11: gpsd.sysconfig
-Source21: gpsd.hotplug.wrapper
-Patch0: gpsd-2.94-silentmake.patch
+Patch0: gpsd-2.95-silentmake.patch
+Patch1: gpsd-2.95-hotplugvars.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
-BuildRequires: libXaw-devel desktop-file-utils
+BuildRequires: libusb1-devel desktop-file-utils
Requires: udev
Requires(post): /sbin/ldconfig
@@ -69,10 +66,12 @@ can run on a serial terminal or terminal
%prep
%setup -q
%patch0 -p1 -b .silentmake
+%patch1 -p1 -b .hotplugvars
%build
%configure \
--enable-dbus \
+ --disable-libQgpsmm \
--disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -84,11 +83,6 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make DESTDIR=%{buildroot} pythondir=%{python_sitearch} install
-# X11 defaults
-%{__install} -d -m 0755 %{buildroot}%{_datadir}/X11/app-defaults/
-%{__install} -p -m 0644 xgpsspeed.ad \
- %{buildroot}%{_datadir}/X11/app-defaults/xgpsspeed
-
# init scripts
%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/init.d
%{__install} -p -m 0755 %{SOURCE10} \
@@ -105,8 +99,7 @@ make DESTDIR=%{buildroot} pythondir=%{py
# hotplug script
%{__install} -d -m 0755 %{buildroot}/lib/udev
-%{__install} -p -m 0755 gpsd.hotplug %{SOURCE21} \
- %{buildroot}/lib/udev
+%{__install} -p -m 0755 gpsd.hotplug gpsd.hotplug.wrapper %{buildroot}/lib/udev
# remove .la files
rm -f %{buildroot}%{_libdir}/libgps*.la
@@ -118,15 +111,15 @@ rm -f %{buildroot}%{_libdir}/libgps*.la
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
- %{SOURCE1}
+ packaging/X11/xgps.desktop
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
--add-category X-Fedora \
- %{SOURCE2}
+ packaging/X11/xgpsspeed.desktop
# Install logo icon for .desktop files
%{__install} -d -m 0755 %{buildroot}%{_datadir}/gpsd
-%{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
+%{__install} -p -m 0644 packaging/X11/gpsd-logo.png %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
%clean
@@ -200,13 +193,18 @@ fi
%{_mandir}/man1/xgpsspeed.1*
%{_mandir}/man1/cgps.1*
%{_mandir}/man1/gpscat.1*
-%{_datadir}/X11/app-defaults/xgpsspeed
%{_datadir}/applications/*.desktop
%dir %{_datadir}/gpsd
%{_datadir}/gpsd/gpsd-logo.png
%changelog
+* Thu Jul 15 2010 Miroslav Lichvar <mlichvar at redhat.com> - 2.95-1
+- update to 2.95
+- add /usr/sbin to PATH in gpsd.hotplug.wrapper
+- pass sysconfig variables to gpsd started from udev
+- enable libusb support
+
* Thu May 06 2010 Miroslav Lichvar <mlichvar at redhat.com> - 2.94-1
- update to 2.94 (#556642)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 6 May 2010 16:14:06 -0000 1.10
+++ sources 15 Jul 2010 15:49:28 -0000 1.11
@@ -1 +1 @@
-ce70bcd707ac1df861d4c72f503c09d1 gpsd-2.94.tar.gz
+12535a9ed9fecf9ea2c5bdc9840da5ae gpsd-2.95.tar.gz
--- gpsd.hotplug.wrapper DELETED ---
--- xgps.desktop DELETED ---
--- xgpsspeed.desktop DELETED ---
More information about the scm-commits
mailing list