packages: gpsd/gpsd-link.patch, gpsd/gpsd.spec, gpsd/gpsd-python.patch (NEW...
qboosh
qboosh at pld-linux.org
Sat Jan 15 23:56:57 CET 2011
Author: qboosh Date: Sat Jan 15 22:56:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added python patch for "make version" to work properly (instead of using dumb make message as .egg-info filename)
- separated -qt-{libs,devel}
- updated link patch to kill -lnsl
- updated X deps
---- Files affected:
packages/gpsd:
gpsd-link.patch (1.1 -> 1.2) , gpsd.spec (1.26 -> 1.27) , gpsd-python.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gpsd/gpsd-link.patch
diff -u packages/gpsd/gpsd-link.patch:1.1 packages/gpsd/gpsd-link.patch:1.2
--- packages/gpsd/gpsd-link.patch:1.1 Thu Jul 8 20:23:33 2010
+++ packages/gpsd/gpsd-link.patch Sat Jan 15 23:56:51 2011
@@ -1,5 +1,22 @@
---- gpsd-2.94/configure.ac~ 2010-07-08 20:16:16.848861269 +0200
-+++ gpsd-2.94/configure.ac 2010-07-08 20:17:38.965519312 +0200
+--- gpsd-2.95/configure.ac~ 2010-07-08 20:16:16.848861269 +0200
++++ gpsd-2.95/configure.ac 2010-07-08 20:17:38.965519312 +0200
+@@ -227,13 +227,13 @@
+ [Define if you have the external 'daylight' variable.])
+ fi
+
+-AC_CHECK_LIB(nsl, gethostbyname, LIBNSL="-lnsl")
++AC_CHECK_FUNC([gethostbyname], , [AC_CHECK_LIB(nsl, gethostbyname, LIBNSL="-lnsl")])
+ AC_SUBST(LIBNSL)
+-AC_CHECK_LIB(socket, socket, LIBSOCKET="-lsocket")
++AC_CHECK_FUNC([socket], , [AC_CHECK_LIB(socket, socket, LIBSOCKET="-lsocket")])
+ AC_SUBST(LIBSOCKET)
+ AC_CHECK_LIB(m, rint, LIBM="-lm")
+ AC_SUBST(LIBM)
+-AC_CHECK_LIB(c, open, LIBC="-lc")
++AC_CHECK_FUNC([open], , [AC_CHECK_LIB(c, open, LIBC="-lc")])
+ AC_SUBST(LIBC)
+ AC_CHECK_LIB(pthread, pthread_setcancelstate,
+ [LIBPTHREAD="-lpthread"
@@ -352,7 +352,7 @@
dnl libncurses. We define our own variables to reduce the risk of
dnl breaking if autoconf changes (private) variable names.
================================================================
Index: packages/gpsd/gpsd.spec
diff -u packages/gpsd/gpsd.spec:1.26 packages/gpsd/gpsd.spec:1.27
--- packages/gpsd/gpsd.spec:1.26 Wed Nov 24 15:23:05 2010
+++ packages/gpsd/gpsd.spec Sat Jan 15 23:56:51 2011
@@ -5,10 +5,9 @@
#
# Conditional build:
%bcond_without dbus # build without dbus support
+%bcond_without bluez # build without Bluetooth support
%bcond_without x # build without X Window System support
-
-%define skip_post_check_so libgpsd.so.0.0.0
-
+#
Summary: Service daemon for mediating access to a GPS
Summary(pl.UTF-8): Oprogramowanie komunikujące się z GPS-em
Name: gpsd
@@ -19,29 +18,36 @@
Source0: http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
# Source0-md5: 12535a9ed9fecf9ea2c5bdc9840da5ae
Patch0: %{name}-link.patch
+Patch1: %{name}-python.patch
URL: http://gpsd.berlios.de/
+BuildRequires: QtNetwork-devel >= 4.4
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
%if %{with dbus}
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
%endif
+%{?with_bluez:BuildRequires: bluez-libs-devel}
BuildRequires: docbook-dtd412-xml
BuildRequires: docbook-style-xsl
BuildRequires: libstdc++-devel
-BuildRequires: libusb-devel
+BuildRequires: libtool >= 2:1.5
+BuildRequires: libusb-devel >= 1.0.0
BuildRequires: libxslt-progs
BuildRequires: ncurses-devel
-%{?with_x:BuildRequires: openmotif-devel}
BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.4
+BuildRequires: qt4-qmake >= 4.4
BuildRequires: rpm-pythonprov
BuildRequires: xmlto
-%{?with_x:BuildRequires: xorg-lib-libXaw-devel}
Requires: %{name}-libs = %{version}-%{release}
Requires: udev-core >= 1:127
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define udevdir /lib/udev
+%define skip_post_check_so libgpsd.so.0.0.0
+
%description
gpsd is a service daemon that mediates access to a GPS sensor
connected to the host computer by serial or USB interface, making its
@@ -93,6 +99,7 @@
Summary(pl.UTF-8): Biblioteki klienckie dla C i Pythona do komunikacji z gpsd lub GPS-em
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+Requires: libstdc++-devel
%description devel
This package provides C header files for the gpsd shared libraries
@@ -116,6 +123,33 @@
%description static -l pl.UTF-8
Statyczna biblioteka kliencka GPS.
+%package qt-libs
+Summary: GPS Qt4 integration library
+Summary(pl.UTF-8): Biblioteka integrująca GPS z Qt4
+Group: X11/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: QtNetwork >= 4.4
+
+%description qt-libs
+GPS Qt4 integration library.
+
+%description qt-libs -l pl.UTF-8
+Biblioteka integrująca GPS z Qt4.
+
+%package qt-devel
+Summary: Development files for GPS Qt4 integration library
+Summary(pl.UTF-8): Pliki programistyczne biblioteki integrującej GPS z Qt4
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-qt-libs = %{version}-%{release}
+Requires: QtNetwork-devel >= 4.4
+
+%description qt-devel
+Development files for GPS Qt4 integration library.
+
+%description qt-devel -l pl.UTF-8
+Pliki programistyczne biblioteki integrującej GPS z Qt4.
+
%package -n python-gps
Summary: Python GPSd client library
Summary(pl.UTF-8): Biblioteka kliencka GPSd dla Pythona
@@ -153,7 +187,8 @@
Summary(pl.UTF-8): Aplikacje klienckie z interfejsem X
Group: Applications/System
Requires: %{name}-libs = %{version}-%{release}
-Requires: xorg-lib-libXt >= 1.0.0
+Requires: python-gps = %{version}-%{release}
+Requires: python-pygtk-gtk >= 2:2.0
%description clients-gui
xgps is a simple test client for gpsd with an X interface. It displays
@@ -173,13 +208,17 @@
%prep
%setup -q
%patch0 -p1
-sed -i -e 's#/usr/lib/libusb-\*\.so#/usr/%{_lib}/libusb-*.so#g' configure*
+%patch1 -p1
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
-%configure CPPFLAGS="-I/usr/include/ncurses $(pkg-config --cflags-only-I libusb-1.0)" \
+%{__autoheader}
+%{__automake}
+%configure \
+ CPPFLAGS="-I/usr/include/ncurses" \
+ %{?with_bluez:--enable-bluetooth} \
%{?with_dbus:--enable-dbus} \
%{!?with_x:--without-x}
@@ -198,6 +237,10 @@
#install gpsd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/gpsd
install dgpsip-servers $RPM_BUILD_ROOT%{_datadir}/gpsd/dgpsip-servers
+# check if missing header installation is up to date
+[ ! -f $RPM_BUILD_ROOT%{_includedir}/libQgpsmm_global.h ] || exit 1
+install libQgpsmm/libQgpsmm_global.h $RPM_BUILD_ROOT%{_includedir}
+
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_postclean
@@ -208,6 +251,9 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post qt-libs -p /sbin/ldconfig
+%postun qt-libs -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc README INSTALL COPYING TODO AUTHORS
@@ -219,7 +265,7 @@
%attr(755,root,root) %{udevdir}/gpsd.hotplug.wrapper
#/etc/udev/rules.d/25-gpsd.rules
#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gpsd
-%dir %{_datadir}/%{name}
+%dir %{_datadir}/gpsd
%{_datadir}/gpsd/dgpsip-servers
%files libs
@@ -228,8 +274,6 @@
%attr(755,root,root) %ghost %{_libdir}/libgpsd.so.0
%attr(755,root,root) %{_libdir}/libgps.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgps.so.19
-%attr(755,root,root) %{_libdir}/libQgpsmm.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQgpsmm.so.19
%files devel
%defattr(644,root,root,755)
@@ -255,6 +299,16 @@
%{_libdir}/libgps.a
%{_libdir}/libgpsd.a
+%files qt-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQgpsmm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libQgpsmm.so.19
+
+%files qt-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libQgpsmm.so
+%{_includedir}/libQgpsmm_global.h
+
%files -n python-gps
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gpscat
@@ -265,7 +319,7 @@
%dir %{py_sitedir}/gps
%attr(755,root,root) %{py_sitedir}/gps/*.so
%{py_sitedir}/gps/*.py[co]
-%{py_sitedir}/*.egg*
+%{py_sitedir}/gps-%{version}-py*.egg-info
%{_mandir}/man1/gpscat.1*
%{_mandir}/man1/gpsfake.1*
@@ -279,7 +333,6 @@
%{?with_dbus:%attr(755,root,root) %{_bindir}/gpxlogger}
%{_mandir}/man1/gpsctl.1*
%{_mandir}/man1/cgps.1*
-#%{_mandir}/man1/cgpxlogger.1*
%{_mandir}/man1/gps.1*
%{_mandir}/man1/gpspipe.1*
@@ -300,6 +353,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2011/01/15 22:56:51 qboosh
+- added python patch for "make version" to work properly (instead of using dumb make message as .egg-info filename)
+- separated -qt-{libs,devel}
+- updated link patch to kill -lnsl
+- updated X deps
+
Revision 1.26 2010/11/24 14:23:05 hawk
- added required skip_post_check_so
================================================================
Index: packages/gpsd/gpsd-python.patch
diff -u /dev/null packages/gpsd/gpsd-python.patch:1.1
--- /dev/null Sat Jan 15 23:56:57 2011
+++ packages/gpsd/gpsd-python.patch Sat Jan 15 23:56:51 2011
@@ -0,0 +1,14 @@
+--- gpsd-2.95/Makefile.am.orig 2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95/Makefile.am 2011-01-15 19:00:45.278364132 +0100
+@@ -375,9 +375,9 @@
+ # when DESTDIR is not defined as distutils would use the current
+ # working directory as root directory and not install to ${prefix}.
+ if test -z "$(DESTDIR)"; then \
+- $(PYTHON) setup.py install --prefix=${prefix} ;\
++ MAKE='$(MAKE)' MAKEFLAGS='' $(PYTHON) setup.py install --prefix=${prefix} ;\
+ else \
+- $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR) ;\
++ MAKE='$(MAKE)' MAKEFLAGS='' $(PYTHON) setup.py install --prefix=${prefix} --root=$(DESTDIR) ;\
+ fi
+ endif
+ if LIB_Q_GPSMM_ENABLE
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsd/gpsd-link.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsd/gpsd.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list