rpms/geoclue/F-11 geoclue-fixgpsd.patch, NONE, 1.1 geoclue-nm08.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.17, 1.18 sources, 1.3, 1.4
Peter Robinson
pbrobinson at fedoraproject.org
Mon Oct 26 14:11:27 UTC 2009
Author: pbrobinson
Update of /cvs/pkgs/rpms/geoclue/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17891
Modified Files:
.cvsignore geoclue.spec sources
Added Files:
geoclue-fixgpsd.patch geoclue-nm08.patch
Log Message:
- New git snapshit, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin
geoclue-fixgpsd.patch:
configure.ac | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
--- NEW FILE geoclue-fixgpsd.patch ---
--- geoclue-0.11.1.1/configure.ac.orig 2009-10-26 11:18:16.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac 2009-10-26 11:19:02.000000000 +0000
@@ -203,21 +203,12 @@
AC_SUBST(GYPSY_LIBS)
AC_SUBST(GYPSY_CFLAGS)
-AC_ARG_ENABLE(gpsd,
- AS_HELP_STRING([--enable-gpsd=@<:@no/yes/auto@:>@],
- [build with gpsd support]), ,
- enable_gpsd=auto)
-
-if test "x$enable_gpsd" != "xno"; then
- AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
- if test "x$have_gpsd" = "xyes"; then
- PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
- GPSD_LIBS="-lgps"
- else
- NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
- fi
- else
- have_gpsd=no
+AC_CHECK_LIB(gps, gps_open,[libgps=yes] )
+if test "x$libgps" = xyes; then
+ PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS gpsd"
+ GPSD_LIBS="-lgps"
+else
+ NO_BUILD_PROVIDERS="$NO_BUILD_PROVIDERS gpsd"
fi
if test "x$enable_gpsd" = "xyes" -a "x$have_gpsd" != "xyes"; then
geoclue-nm08.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE geoclue-nm08.patch ---
--- geoclue-0.11.1.1/configure.ac.orig 2009-10-26 10:49:36.000000000 +0000
+++ geoclue-0.11.1.1/configure.ac 2009-10-26 10:50:03.000000000 +0000
@@ -123,7 +123,7 @@
if test "x$enable_networkmanager" != "xno"; then
PKG_CHECK_MODULES(NETWORK_MANAGER,
[
- NetworkManager libnm_glib
+ NetworkManager libnm-glib
], have_networkmanager="yes", have_networkmanager="no")
if test "x$have_networkmanager" = "xyes"; then
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 10 Mar 2009 17:16:44 -0000 1.3
+++ .cvsignore 26 Oct 2009 14:11:27 -0000 1.4
@@ -1 +1 @@
-geoclue-0.11.1.1-20090310.tar.gz
+geoclue-0.11.1.1-20091026.tar.gz
Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/geoclue.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- geoclue.spec 20 Jun 2009 00:07:29 -0000 1.17
+++ geoclue.spec 26 Oct 2009 14:11:27 -0000 1.18
@@ -1,15 +1,15 @@
# Tarfile created using git
# git clone git://anongit.freedesktop.org/geoclue
-# git-archive --format=tar --prefix=geoclue-0.1.11.1/ %{git_version} | gzip > ~/geoclue-0.1.11.1-20090310.tar.gz
+# git archive --format=tar --prefix=geoclue-0.11.1.1/ %{git_version} | gzip > ~/geoclue-%{version}-%{gitdate}.tar.gz
-%define gitdate 20090310
-%define git_version 3a31d26
+%define gitdate 20091026
+%define git_version 73b6729
%define tarfile %{name}-%{version}-%{gitdate}.tar.gz
%define snapshot %{gitdate}git%{git_version}
Name: geoclue
Version: 0.11.1.1
-Release: 0.6.%{snapshot}%{?dist}
+Release: 0.9.%{snapshot}%{?dist}
Summary: A modular geoinformation service
Group: System Environment/Libraries
@@ -17,18 +17,24 @@ License: LGPLv2
URL: http://geoclue.freedesktop.org/
#Source0: http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
Source0: %{tarfile}
+Patch0: geoclue-nm08.patch
+Patch1: geoclue-fixgpsd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
+BuildRequires: gammu-devel
BuildRequires: glib2-devel
BuildRequires: libxml2-devel
+BuildRequires: libsoup-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
BuildRequires: gypsy-devel
BuildRequires: gpsd-devel
BuildRequires: gtk-doc
+
# Require these until we move back to a formal release
BuildRequires: libtool
BuildRequires: automake
@@ -48,14 +54,23 @@ Requires: %{name} = %{version}-%{release
Requires: dbus-devel
Requires: libxml2-devel
Requires: pkgconfig
-Requires: gtk-doc
+
%description devel
Files for development with geoclue.
+%package doc
+Summary: Developer documentation for geoclue
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: gtk-doc
+BuildArch: noarch
+
+%description doc
+Developer documentation for geoclue
+
%package gui
Summary: Testing gui for geoclue
Group: Development/Libraries
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description gui
@@ -63,28 +78,36 @@ Testing gui for geoclue
%package gpsd
Summary: gpsd provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gpsd
%description gpsd
A gpsd provider for geoclue
%package gypsy
Summary: gypsy provider for geoclue
-Group: Development/Libraries
+Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gypsy
%description gypsy
A gypsy provider for geoclue
+%package gsmloc
+Summary: gsmloc provider for geoclue
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description gsmloc
+A gsmloc provider for geoclue
+
%prep
%setup -q
+%patch0 -p1 -b .nm08
+%patch1 -p1 -b .fixgpsd
%build
./autogen.sh
-%configure --disable-static --enable-gtk-doc
+%configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
make %{?_smp_mflags}
%install
@@ -115,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Localnet.service
%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Manual.service
%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Plazes.service
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Skyhook.service
%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Yahoo.service
%{_datadir}/geoclue-providers/geoclue-example.provider
%{_datadir}/geoclue-providers/geoclue-geonames.provider
@@ -122,6 +146,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/geoclue-providers/geoclue-localnet.provider
%{_datadir}/geoclue-providers/geoclue-manual.provider
%{_datadir}/geoclue-providers/geoclue-plazes.provider
+%{_datadir}/geoclue-providers/geoclue-skyhook.provider
%{_datadir}/geoclue-providers/geoclue-yahoo.provider
%{_libexecdir}/geoclue-example
%{_libexecdir}/geoclue-geonames
@@ -130,6 +155,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libexecdir}/geoclue-manual
%{_libexecdir}/geoclue-master
%{_libexecdir}/geoclue-plazes
+%{_libexecdir}/geoclue-skyhook
%{_libexecdir}/geoclue-yahoo
%files devel
@@ -137,6 +163,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/geoclue
%{_libdir}/pkgconfig/geoclue.pc
%{_libdir}/libgeoclue.so
+
+%files doc
+%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/geoclue/
%files gui
@@ -155,12 +184,24 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/geoclue-providers/geoclue-gypsy.provider
%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gypsy.service
+%files gsmloc
+%defattr(-,root,root,-)
+%{_libexecdir}/geoclue-gsmloc
+%{_datadir}/geoclue-providers/geoclue-gsmloc.provider
+%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
+
%changelog
-* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6
-- Add missing gtk-doc requires
+* Mon Oct 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.9
+- New git snapshit, enable NetworkManager support for WiFi location, gsmloc and new Skyhook plugin
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1.1-0.8.20090310git3a31d26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.5
-- Package the developer documentation as well
+* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7
+- Move develop documentation to its own noarch package to fix RHBZ 513488
+
+* Sat Jun 20 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.6
+- Add developer documentation
* Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.4
- Fix geoclue-test-gui (#506921)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 10 Mar 2009 17:16:45 -0000 1.3
+++ sources 26 Oct 2009 14:11:27 -0000 1.4
@@ -1 +1 @@
-e7c5cede9f8e18e9bbd1fb3af78a594b geoclue-0.11.1.1-20090310.tar.gz
+6323f039a2ce88bcc71b5cd5f31e4456 geoclue-0.11.1.1-20091026.tar.gz
More information about the fedora-extras-commits
mailing list