rpms/geoclue/F-12 geoclue-fixgpsd.patch, NONE, 1.1 geoclue-nm08.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.18, 1.19 sources, 1.3, 1.4

Mon Oct 26 13:22:27 UTC 2009

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4532

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-12/.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 13:22:26 -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-12/geoclue.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- geoclue.spec	24 Jul 2009 23:52:20 -0000	1.18
+++ geoclue.spec	26 Oct 2009 13:22:26 -0000	1.19
@@ -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.8.%{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
@@ -65,7 +71,6 @@ Developer documentation for geoclue
 %package gui
 Summary: Testing gui for geoclue
 Group: Development/Libraries
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description gui
@@ -73,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
@@ -125,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
@@ -132,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
@@ -140,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
@@ -168,14 +184,23 @@ 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
+* 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
 
-* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7.%{gitdate}git%{git_version}
+* 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.%{gitdate}git%{git_version}
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/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 13:22:26 -0000	1.4
@@ -1 +1 @@
-e7c5cede9f8e18e9bbd1fb3af78a594b  geoclue-0.11.1.1-20090310.tar.gz
+6323f039a2ce88bcc71b5cd5f31e4456  geoclue-0.11.1.1-20091026.tar.gz


