rpms/gpsd/F-7 python-pyexecdir-install-gpsd-2.37.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gpsd.spec, 1.14, 1.15 sources, 1.5, 1.6 install-gpsd_config.h.patch, 1.1, NONE
Douglas E. Warner (silfreed)
fedora-extras-commits at redhat.com
Thu Feb 28 19:26:33 UTC 2008
Author: silfreed
Update of /cvs/pkgs/rpms/gpsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320
Modified Files:
.cvsignore gpsd.spec sources
Added Files:
python-pyexecdir-install-gpsd-2.37.patch
Removed Files:
install-gpsd_config.h.patch
Log Message:
* Wed Feb 27 2008 Douglas E. Warner <silfreed at silfreed.net> - 2.37-1
- update to 2.37
- removed install-gpsd_config.h.patch
- installed pkgconfig files in devel package
- added patch to install python modules in sitearch
- removing rpath from inclucded libtool
- moving X11 app-defaults to datadir
- using macros for commands in install; using install instead of cp and mkdir
- cleaning up spaces/tabs for rpmlint
python-pyexecdir-install-gpsd-2.37.patch:
--- NEW FILE python-pyexecdir-install-gpsd-2.37.patch ---
diff -ruN gpsd-2.37/Makefile.in gpsd-2.37-new/Makefile.in
--- gpsd-2.37/Makefile.in 2008-02-17 12:41:06.000000000 -0500
+++ gpsd-2.37-new/Makefile.in 2008-02-28 11:45:00.000000000 -0500
@@ -77,7 +77,7 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)" \
+ "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" \
@@ -966,21 +966,21 @@
uninstall-info-am:
install-nodist_pythonPYTHON: $(nodist_python_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(pythondir)" || $(mkdir_p) "$(DESTDIR)$(pythondir)"
+ test -z "$(pyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pyexecdir)"
@list='$(nodist_python_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
f=$(am__strip_dir) \
dlist="$$dlist $$f"; \
- echo " $(nodist_pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
- $(nodist_pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \
+ echo " $(nodist_pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
+ $(nodist_pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
else :; fi; \
done; \
if test -n "$$dlist"; then \
if test -z "$(DESTDIR)"; then \
- PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
+ PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
else \
- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
+ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \
fi; \
else :; fi
@@ -988,27 +988,27 @@
@$(NORMAL_UNINSTALL)
@list='$(nodist_python_PYTHON)'; dlist=''; for p in $$list; do\
f=$(am__strip_dir) \
- rm -f "$(DESTDIR)$(pythondir)/$$f"; \
- rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \
- rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \
+ rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \
+ rm -f "$(DESTDIR)$(pyexecdir)/$${f}c"; \
+ rm -f "$(DESTDIR)$(pyexecdir)/$${f}o"; \
done
install-pythonPYTHON: $(python_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(pythondir)" || $(mkdir_p) "$(DESTDIR)$(pythondir)"
+ test -z "$(pyexecdir)" || $(mkdir_p) "$(DESTDIR)$(pyexecdir)"
@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
f=$(am__strip_dir) \
dlist="$$dlist $$f"; \
- echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
- $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \
+ echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
+ $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
else :; fi; \
done; \
if test -n "$$dlist"; then \
if test -z "$(DESTDIR)"; then \
- PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
+ PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
else \
- PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
+ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pyexecdir)" $$dlist; \
fi; \
else :; fi
@@ -1016,9 +1016,9 @@
@$(NORMAL_UNINSTALL)
@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
f=$(am__strip_dir) \
- rm -f "$(DESTDIR)$(pythondir)/$$f"; \
- rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \
- rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \
+ rm -f "$(DESTDIR)$(pyexecdir)/$$f"; \
+ rm -f "$(DESTDIR)$(pyexecdir)/$${f}c"; \
+ rm -f "$(DESTDIR)$(pyexecdir)/$${f}o"; \
done
install-man1: $(man1_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
@@ -1436,7 +1436,7 @@
install-binPROGRAMS: install-libLTLIBRARIES
installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 30 Jun 2007 16:04:25 -0000 1.5
+++ .cvsignore 28 Feb 2008 19:25:59 -0000 1.6
@@ -1,2 +1,2 @@
-gpsd-2.34.tar.gz
+gpsd-2.37.tar.gz
gpsd-logo.png
Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/F-7/gpsd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gpsd.spec 19 Aug 2007 13:29:50 -0000 1.14
+++ gpsd.spec 28 Feb 2008 19:26:00 -0000 1.15
@@ -1,23 +1,25 @@
-Name: gpsd
-Version: 2.34
-Release: 5%{?dist}
-Summary: Service daemon for mediating access to a GPS
-
-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
-Patch: install-gpsd_config.h.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+Name: gpsd
+Version: 2.37
+Release: 1%{?dist}
+Summary: Service daemon for mediating access to a GPS
+
+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
+Patch0: python-pyexecdir-install-gpsd-2.37.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
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
%description
gpsd is a service daemon that mediates access to a GPS sensor
@@ -30,17 +32,18 @@
parse than NMEA 0183.
%package devel
-Summary: Client libraries in C and Python for talking to a running gpsd or GPS
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary: Client libraries in C and Python for talking to a running gpsd or GPS
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
%description devel
-This package provides C header files for the gpsd shared libraries
-that manage access to a GPS for applications; also Python modules.
+This package provides C header files and python modules for the gpsd shared
+libraries that manage access to a GPS for applications
-%package clients
-Summary: Clients for gpsd
-Group: Applications/System
+%package clients
+Summary: Clients for gpsd
+Group: Applications/System
%description clients
xgps is a simple test client for gpsd with an X interface. It displays
@@ -55,52 +58,68 @@
cgps resembles xgps, but without the pictorial satellite display. It
can run on a serial terminal or terminal emulator.
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%prep
%setup -q
-%patch -p1
+%patch0 -p1
+
%build
%configure --enable-dbus --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
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}
+make DESTDIR=%{buildroot} install
-make install DESTDIR=%{buildroot}
-# additional gpsd files
-mkdir -p %{buildroot}%{_libdir}/X11/app-defaults/
-cp -p xgps.ad %{buildroot}%{_libdir}/X11/app-defaults/xgps
-cp -p xgpsspeed.ad %{buildroot}%{_libdir}/X11/app-defaults/xgpsspeed
-mkdir -p %{buildroot}%{_sysconfdir}/hotplug.d/usb
-cp -p gpsd.hotplug gpsd.usermap %{buildroot}%{_sysconfdir}/hotplug.d/usb/
+# 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
+
+# hotplug script
+%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/hotplug.d/usb
+%{__install} -p -m 0644 gpsd.hotplug gpsd.usermap \
+ %{buildroot}%{_sysconfdir}/hotplug.d/usb/
-#remove nasty little .la files
+# remove .la files
rm -f %{buildroot}%{_libdir}/libgps.la
-#Install the .desktop files
-desktop-file-install --vendor fedora \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora \
- %{SOURCE1}
-desktop-file-install --vendor fedora \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora \
- %{SOURCE2}
-
-#Install logo icon for .desktop files
-mkdir -p %{buildroot}%{_datadir}/gpsd
-cp -p %{SOURCE3} %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
+# fix non-executable libraries
+%{__chmod} +x %{buildroot}%{_libdir}/libgps.so.17.0.0
+%{__chmod} +x %{buildroot}%{python_sitearch}/gpspacket.so
+
+# fix non-executable python script
+%{__chmod} +x %{buildroot}%{python_sitearch}/gps.py
+
+# Install the .desktop files
+desktop-file-install --vendor fedora \
+ --dir %{buildroot}%{_datadir}/applications \
+ --add-category X-Fedora \
+ %{SOURCE1}
+desktop-file-install --vendor fedora \
+ --dir %{buildroot}%{_datadir}/applications \
+ --add-category X-Fedora \
+ %{SOURCE2}
+
+# Install logo icon for .desktop files
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/gpsd
+%{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
+
%clean
rm -rf %{buildroot}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc README INSTALL COPYING
@@ -109,13 +128,13 @@
%{_bindir}/sirfmon
%{_bindir}/gpsctl
%{_libdir}/libgps.so.*
+%{python_sitearch}/gps.py*
%{_mandir}/man8/gpsd.8*
%{_mandir}/man1/gpsprof.1*
%{_mandir}/man1/sirfmon.1*
%{_mandir}/man1/gpsctl.1*
%{_sysconfdir}/hotplug.d/usb/gpsd.hotplug
%{_sysconfdir}/hotplug.d/usb/gpsd.usermap
-%{python_sitelib}/gps.py*
%files devel
%defattr(-,root,root,-)
@@ -123,13 +142,13 @@
%{_bindir}/gpsfake
%{_bindir}/rtcmdecode
%{_bindir}/gpsflash
-%{python_sitelib}/gpsfake*
-%{python_sitelib}/gpspacket.so
%{_libdir}/libgps.so
+%{_libdir}/pkgconfig/*.pc
+%{python_sitearch}/gpsfake*
+%{python_sitearch}/gpspacket.so
%{_includedir}/gps.h
%{_includedir}/libgpsmm.h
%{_includedir}/gpsd.h
-%{_includedir}/gpsd_config.h
%{_mandir}/man1/gpsfake.1*
%{_mandir}/man1/rtcmdecode.1*
%{_mandir}/man1/gpsflash.1*
@@ -155,17 +174,42 @@
%{_mandir}/man1/cgps.1*
%{_mandir}/man1/gpscat.1*
%{_mandir}/man1/cgpxlogger.1*
-%{_libdir}/X11/app-defaults/xgps
-%{_libdir}/X11/app-defaults/xgpsspeed
+%{_datadir}/X11/app-defaults/xgps
+%{_datadir}/X11/app-defaults/xgpsspeed
%{_datadir}/applications/*.desktop
%dir %{_datadir}/gpsd
%{_datadir}/gpsd/gpsd-logo.png
+
%changelog
-* Sun Aug 19 2007 Matthew Truch <matt at truch.net> - 2.34-5
+* Wed Feb 27 2008 Douglas E. Warner <silfreed at silfreed.net> - 2.37-1
+- update to 2.37
+- removed install-gpsd_config.h.patch
+- installed pkgconfig files in devel package
+- added patch to install python modules in sitearch
+- removing rpath from inclucded libtool
+- moving X11 app-defaults to datadir
+- using macros for commands in install; using install instead of cp and mkdir
+- cleaning up spaces/tabs for rpmlint
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.34-9
+- Autorebuild for GCC 4.3
+
+* Sun Aug 19 2007 Matthew Truch <matt at truch.net> - 2.34-8
- Patch Makefile to also install gpsd_config.h as needed by
libgpsmm.h. Redhat BZ 253433.
+* Sat Jun 30 2007 Matthew Truch <matt at truch.net> - 2.34-7
+- Make sure the logo is actually included (via the spec file).
+ I need to wake up before I try even trivial updates.
+
+* Sat Jun 30 2007 Matthew Truch <matt at truch.net> - 2.34-6
+- Learn how to use search and replace (aka fix all instances of
+ gpsd-logo.png spelled incorrectly as gspd-logo.png).
+
+* Sat Jun 30 2007 Matthew Truch <matt at truch.net> - 2.34-5
+- Fix desktop file and logo file name.
+
* Sat Jun 30 2007 Matthew Truch <matt at truch.net> - 2.34-4
- Include icon for .desktop files per BZ 241428
@@ -191,7 +235,7 @@
- Bump release for rebuild in prep. for FC6.
* Thu Jul 20 2006 Matthew Truch <matt at truch.net> - 2.33-3
-- Actually, was a missing BR glib-dbus-devel. Ooops.
+- Actually, was a missing BR glib-dbus-devel. Ooops.
* Thu Jul 20 2006 Matthew Truch <matt at truch.net> - 2.33-2
- Missing BR glib-devel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 30 Jun 2007 16:04:25 -0000 1.5
+++ sources 28 Feb 2008 19:26:00 -0000 1.6
@@ -1,2 +1,3 @@
-1ad07e10f34e46ffdaf10688743f2f43 gpsd-2.34.tar.gz
+6c96cc0b2df0279cb7baac1ebc5881d3 gpsd-2.37.tar.gz
f742145dff43d607f7014aa387835738 gpsd-logo.png
+
--- install-gpsd_config.h.patch DELETED ---
More information about the fedora-extras-commits
mailing list