packages: gpsd/gpsd.spec, gpsd/gpsd-ncurses.patch (REMOVED), gpsd/gpsd-udev...

[wrobell]

Author: wrobell                      Date: Sun Mar 28 03:00:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ver. 2.92
- ncurses patch replaced with CPPFLAGS switch
- udev merged with the sources

---- Files affected:
packages/gpsd:
   gpsd.spec (1.19 -> 1.20) , gpsd-ncurses.patch (1.4 -> NONE)  (REMOVED), gpsd-udev.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/gpsd/gpsd.spec
diff -u packages/gpsd/gpsd.spec:1.19 packages/gpsd/gpsd.spec:1.20
--- packages/gpsd/gpsd.spec:1.19	Tue Oct 20 23:51:53 2009
+++ packages/gpsd/gpsd.spec	Sun Mar 28 05:00:53 2010
@@ -10,17 +10,13 @@
 Summary:	Service daemon for mediating access to a GPS
 Summary(pl.UTF-8):	Oprogramowanie komunikujące się z GPS-em
 Name:		gpsd
-Version:	2.39
-Release:	3
+Version:	2.92
+Release:	0.1
 License:	BSD
 Group:		Daemons
 Source0:	http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
-# Source0-md5:	3db437196a6840c252fca99b6c19d4d0
-Patch0:		%{name}-ncurses.patch
-Patch1:		%{name}-udev.patch
+# Source0-md5:	50b60d9f6dd51e001f4dfbaeb825c988
 URL:		http://gpsd.berlios.de/
-BuildRequires:	autoconf
-BuildRequires:	automake
 %if %{with dbus}
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-glib-devel
@@ -169,16 +165,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
+%configure CPPFLAGS="-I%{_includedir}/ncurses" \
 	%{?with_dbus:--enable-dbus} \
 	%{!?with_x:--without-x}
 
@@ -193,8 +182,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install gpsd.hotplug gpsd.hotplug.wrapper $RPM_BUILD_ROOT%{udevdir}
-install	gpsd.udev $RPM_BUILD_ROOT/etc/udev/rules.d/25-gpsd.rules
-install	gpsd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/gpsd
+#install	gpsd.udev $RPM_BUILD_ROOT/etc/udev/rules.d/25-gpsd.rules
+#install	gpsd.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/gpsd
 install dgpsip-servers $RPM_BUILD_ROOT%{_datadir}/gpsd/dgpsip-servers
 
 %if %{with x}
@@ -202,8 +191,8 @@
 install -D xgpsspeed.ad $RPM_BUILD_ROOT%{_appdefsdir}/xgpsspeed
 %endif
 
-mv $RPM_BUILD_ROOT%{py_sitescriptdir}/*.so $RPM_BUILD_ROOT%{py_sitedir}
-
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
 %clean
@@ -221,19 +210,18 @@
 %{_mandir}/man1/gpsmon.1*
 %attr(755,root,root) %{udevdir}/gpsd.hotplug
 %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
+#/etc/udev/rules.d/25-gpsd.rules
+#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/gpsd
 %dir %{_datadir}/%{name}
 %{_datadir}/gpsd/dgpsip-servers
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgps.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgps.so.18
+%attr(755,root,root) %ghost %{_libdir}/libgps.so.19
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gpsflash
 %attr(755,root,root) %{_bindir}/gpsdecode
 %attr(755,root,root) %{_libdir}/libgps.so
 %{_libdir}/libgps.la
@@ -242,7 +230,6 @@
 %{_includedir}/libgpsmm.h
 %{_pkgconfigdir}/libgps.pc
 %{_pkgconfigdir}/libgpsd.pc
-%{_mandir}/man1/gpsflash.1*
 %{_mandir}/man1/gpsdecode.1*
 %{_mandir}/man3/libgps.3*
 %{_mandir}/man3/libgpsd.3*
@@ -259,11 +246,13 @@
 %attr(755,root,root) %{_bindir}/gpscat
 %attr(755,root,root) %{_bindir}/gpsfake
 %attr(755,root,root) %{_bindir}/gpsprof
-%{py_sitescriptdir}/gps.py[co]
 %{py_sitescriptdir}/gpscap.py[co]
-%{py_sitescriptdir}/gpsfake.py[co]
-%attr(755,root,root) %{py_sitedir}/gpslib.so
-%attr(755,root,root) %{py_sitedir}/gpspacket.so
+
+%dir %{py_sitedir}/gps
+%attr(755,root,root) %{py_sitedir}/gps/*.so
+%{py_sitedir}/gps/*.py[co]
+%{py_sitedir}/*.egg*
+
 %{_mandir}/man1/gpscat.1*
 %{_mandir}/man1/gpsfake.1*
 %{_mandir}/man1/gpsprof.1*
@@ -276,7 +265,7 @@
 %{?with_dbus:%attr(755,root,root) %{_bindir}/gpxlogger}
 %{_mandir}/man1/gpsctl.1*
 %{_mandir}/man1/cgps.1*
-%{_mandir}/man1/cgpxlogger.1*
+#%{_mandir}/man1/cgpxlogger.1*
 %{_mandir}/man1/gps.1*
 %{_mandir}/man1/gpspipe.1*
 
@@ -298,6 +287,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/03/28 03:00:53  wrobell
+- ver. 2.92
+- ncurses patch replaced with CPPFLAGS switch
+- udev merged with the sources
+
 Revision 1.19  2009/10/20 21:51:53  arekm
 - rel 3; wrapper should be executable
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsd/gpsd.spec?r1=1.19&r2=1.20&f=u