rpms/gpsd/devel gpsd-2.94-silentmake.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 gpsd.spec, 1.34, 1.35 sources, 1.9, 1.10 gpsd-2.39-implicitlibdeps.patch, 1.1, NONE gpsd-2.39-install-gpsdclient-header.patch, 1.1, NONE parallel-make-dependencies.patch, 1.2, NONE python-pyexecdir-install-gpsd-2.38.patch, 1.1, NONE

Thu May 6 16:14:06 UTC 2010

Author: mlichvar

Update of /cvs/pkgs/rpms/gpsd/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22878

Modified Files:
	.cvsignore gpsd.spec sources 
Added Files:
	gpsd-2.94-silentmake.patch 
Removed Files:
	gpsd-2.39-implicitlibdeps.patch 
	gpsd-2.39-install-gpsdclient-header.patch 
	parallel-make-dependencies.patch 
	python-pyexecdir-install-gpsd-2.38.patch 
Log Message:
- update to 2.94 (#556642)


gpsd-2.94-silentmake.patch:
 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpsd-2.94-silentmake.patch ---
diff -up gpsd-2.94/setup.py.silentmake gpsd-2.94/setup.py
--- gpsd-2.94/setup.py.silentmake	2010-04-20 11:37:21.000000000 +0200
+++ gpsd-2.94/setup.py	2010-04-30 14:48:19.000000000 +0200
@@ -56,7 +56,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 + " 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	19 Mar 2009 18:32:51 -0000	1.9
+++ .cvsignore	6 May 2010 16:14:04 -0000	1.10
@@ -1 +1 @@
-gpsd-2.39.tar.gz
+gpsd-2.94.tar.gz


Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- gpsd.spec	2 Mar 2010 17:00:43 -0000	1.34
+++ gpsd.spec	6 May 2010 16:14:04 -0000	1.35
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name: gpsd
-Version: 2.39
-Release: 7%{?dist}
+Version: 2.94
+Release: 1%{?dist}
 Summary: Service daemon for mediating access to a GPS
 
 Group: System Environment/Daemons
@@ -15,16 +15,11 @@ Source3: gpsd-logo.png
 Source10: gpsd.init
 Source11: gpsd.sysconfig
 Source21: gpsd.hotplug.wrapper
-Patch0: python-pyexecdir-install-gpsd-2.38.patch
-Patch1: parallel-make-dependencies.patch
-# Viking needs this header file to be able to build
-Patch2:	gpsd-2.39-install-gpsdclient-header.patch
-Patch3:	gpsd-2.39-implicitlibdeps.patch
+Patch0: gpsd-2.94-silentmake.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
-BuildRequires: lesstif-devel libXaw-devel desktop-file-utils
-BuildRequires: python
+BuildRequires: libXaw-devel desktop-file-utils
 
 Requires: udev
 Requires(post): /sbin/ldconfig
@@ -73,30 +68,24 @@ can run on a serial terminal or terminal
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-sed -i 's/SYSFS/ATTRS/g' gpsd.rules
+%patch0 -p1 -b .silentmake
 
 %build
 %configure \
-	--disable-rpath \
 	--enable-dbus \
 	--disable-static
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ltmain.sh
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ltmain.sh
+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
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} pythondir=%{python_sitearch} install
 
 # X11 defaults
 %{__install} -d -m 0755 %{buildroot}%{_datadir}/X11/app-defaults/
-%{__install} -p -m 0644 xgps.ad %{buildroot}%{_datadir}/X11/app-defaults/xgps
 %{__install} -p -m 0644 xgpsspeed.ad \
 	%{buildroot}%{_datadir}/X11/app-defaults/xgpsspeed
 
@@ -119,18 +108,11 @@ make DESTDIR=%{buildroot} install
 %{__install} -p -m 0755 gpsd.hotplug %{SOURCE21} \
 	%{buildroot}/lib/udev
 
-# create new gpxlogger man page
-%{__cp} -p %{buildroot}%{_mandir}/man1/cgpxlogger.1 \
-	%{buildroot}%{_mandir}/man1/gpxlogger.1
-
 # remove .la files
-rm -f %{buildroot}%{_libdir}/libgps.la
-
-# fix non-executable libraries
-%{__chmod} +x %{buildroot}%{python_sitearch}/gpspacket.so
+rm -f %{buildroot}%{_libdir}/libgps*.la
 
 # fix non-executable python script
-%{__chmod} +x %{buildroot}%{python_sitearch}/gps.py
+%{__chmod} +x %{buildroot}%{python_sitearch}/gps/gps.py
 
 # Install the .desktop files
 desktop-file-install --vendor fedora \
@@ -174,12 +156,10 @@ fi
 %{_bindir}/gpsprof
 %{_bindir}/gpsmon
 %{_bindir}/gpsctl
-%{_libdir}/libgps.so.*
+%{_libdir}/libgps*.so.*
 /lib/udev/gpsd*
-%{python_sitearch}/gps.py*
-%{python_sitearch}/gpscap.py*
-%{python_sitearch}/gpslib.so
-%{python_sitearch}/gpspacket.so
+%{python_sitearch}/gps*
+%exclude %{python_sitearch}/gps/fake*
 %{_mandir}/man8/gpsd.8*
 %{_mandir}/man1/gpsprof.1*
 %{_mandir}/man1/gpsmon.1*
@@ -189,16 +169,13 @@ fi
 %defattr(-,root,root,-)
 %doc TODO
 %{_bindir}/gpsfake
-%{_bindir}/gpsflash
-%{_libdir}/libgps.so
+%{_libdir}/libgps*.so
 %{_libdir}/pkgconfig/*.pc
-%{python_sitearch}/gpsfake*
+%{python_sitearch}/gps/fake*
 %{_includedir}/gps.h
 %{_includedir}/libgpsmm.h
 %{_includedir}/gpsd.h
-%{_includedir}/gpsdclient.h
 %{_mandir}/man1/gpsfake.1*
-%{_mandir}/man1/gpsflash.1*
 %{_mandir}/man3/libgps.3*
 %{_mandir}/man3/libgpsmm.3*
 %{_mandir}/man3/libgpsd.3*
@@ -215,17 +192,14 @@ fi
 %{_bindir}/lcdgps
 %{_bindir}/xgps
 %{_bindir}/xgpsspeed
-%{_mandir}/man1/cgpxlogger.1*
 %{_mandir}/man1/gps.1*
 %{_mandir}/man1/gpsdecode.1*
 %{_mandir}/man1/gpspipe.1*
-%{_mandir}/man1/gpxlogger.1*
 %{_mandir}/man1/lcdgps.1*
 %{_mandir}/man1/xgps.1*
 %{_mandir}/man1/xgpsspeed.1*
 %{_mandir}/man1/cgps.1*
 %{_mandir}/man1/gpscat.1*
-%{_datadir}/X11/app-defaults/xgps
 %{_datadir}/X11/app-defaults/xgpsspeed
 %{_datadir}/applications/*.desktop
 %dir %{_datadir}/gpsd
@@ -233,6 +207,9 @@ fi
 
 
 %changelog
+* Thu May 06 2010 Miroslav Lichvar <mlichvar at redhat.com> - 2.94-1
+- update to 2.94 (#556642)
+
 * Tue Mar 02 2010 Miroslav Lichvar <mlichvar at redhat.com> - 2.39-7
 - don't use deprecated SYSFS{} in udev rules (#569089)
 - fix init script LSB compliance


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	19 Mar 2009 18:32:51 -0000	1.9
+++ sources	6 May 2010 16:14:06 -0000	1.10
@@ -1 +1 @@
-3db437196a6840c252fca99b6c19d4d0  gpsd-2.39.tar.gz
+ce70bcd707ac1df861d4c72f503c09d1  gpsd-2.94.tar.gz


--- gpsd-2.39-implicitlibdeps.patch DELETED ---


--- gpsd-2.39-install-gpsdclient-header.patch DELETED ---


--- parallel-make-dependencies.patch DELETED ---


--- python-pyexecdir-install-gpsd-2.38.patch DELETED ---

