rpms/geoclue/F-12 .cvsignore, 1.4, 1.5 geoclue.spec, 1.21, 1.22 sources, 1.4, 1.5 0001-Add-error-type-registration.patch, 1.1, NONE 0002-Don-t-lose-special-D-Bus-error-sauce-when-copying.patch, 1.1, NONE geoclue-fixgpsd.patch, 1.1, NONE

Peter Robinson pbrobinson at fedoraproject.org
Mon Jun 28 13:47:09 UTC 2010 

Author: pbrobinson

Update of /cvs/pkgs/rpms/geoclue/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20656

Modified Files:
	.cvsignore geoclue.spec sources 
Removed Files:
	0001-Add-error-type-registration.patch 
	0002-Don-t-lose-special-D-Bus-error-sauce-when-copying.patch 
	geoclue-fixgpsd.patch 
Log Message:
- New official upstream 0.12.0 release, drop gpsd support


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	26 Oct 2009 13:22:26 -0000	1.4
+++ .cvsignore	28 Jun 2010 13:47:09 -0000	1.5
@@ -1 +1 @@
-geoclue-0.11.1.1-20091026.tar.gz
+geoclue-0.12.0.tar.gz


Index: geoclue.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/geoclue.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- geoclue.spec	29 Jan 2010 12:51:11 -0000	1.21
+++ geoclue.spec	28 Jun 2010 13:47:09 -0000	1.22
@@ -1,28 +1,13 @@
-# Tarfile created using git
-# git clone git://anongit.freedesktop.org/geoclue
-# git archive --format=tar --prefix=geoclue-0.11.1.1/ %{git_version} | gzip > ~/geoclue-%{version}-%{gitdate}.tar.gz
-
-%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.11.%{snapshot}%{?dist}
-Summary:        A modular geoinformation service
-
-Group:          System Environment/Libraries
-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
-Patch2:         0001-Add-error-type-registration.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=528897#c15•
-Patch3:         0002-Don-t-lose-special-D-Bus-error-sauce-when-copying.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:          geoclue
+Version:       0.12.0
+Release:       1%{?dist}
+Summary:       A modular geoinformation service
+
+Group:         System Environment/Libraries
+License:       LGPLv2
+URL:           http://geoclue.freedesktop.org/
+Source0:       http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
+Patch0:        geoclue-nm08.patch
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -35,13 +20,11 @@ BuildRequires: gtk2-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: gypsy-devel
-BuildRequires: gpsd-devel
 BuildRequires: gtk-doc
+Obsoletes: geoclue-gpsd
 
-# Require these until we move back to a formal release
+#Needed for NetworkManager patch
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
 
 Requires: dbus
 
@@ -79,14 +62,6 @@ Requires: %{name} = %{version}-%{release
 %description gui
 Testing gui for geoclue
 
-%package gpsd
-Summary: gpsd provider for geoclue
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description gpsd
-A gpsd provider for geoclue
-
 %package gypsy
 Summary: gypsy provider for geoclue
 Group: System Environment/Libraries
@@ -106,19 +81,22 @@ A gsmloc provider for geoclue
 %prep
 %setup -q
 %patch0 -p1 -b .nm08
-%patch1 -p1 -b .fixgpsd
-%patch2 -p1 -b .reg-errors
-%patch3 -p1 -b .error-sauce
+
+# Need this for the NM-0.8 patch
+gtkdocize
+autoreconf
 
 %build
-./autogen.sh
 %configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/libgeoclue.la
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+
 # Install the test gui as it seems the test isn't installed any more
 mkdir $RPM_BUILD_ROOT%{_bindir}
 cp test/.libs/geoclue-test-gui $RPM_BUILD_ROOT%{_bindir}/
@@ -142,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Hostip.service
 %{_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.Nominatim.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
@@ -150,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-hostip.provider
 %{_datadir}/geoclue-providers/geoclue-localnet.provider
 %{_datadir}/geoclue-providers/geoclue-manual.provider
+%{_datadir}/geoclue-providers/geoclue-nominatim.provider
 %{_datadir}/geoclue-providers/geoclue-plazes.provider
 %{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_datadir}/geoclue-providers/geoclue-yahoo.provider
@@ -158,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/geoclue-hostip
 %{_libexecdir}/geoclue-localnet
 %{_libexecdir}/geoclue-manual
+%{_libexecdir}/geoclue-nominatim
 %{_libexecdir}/geoclue-master
 %{_libexecdir}/geoclue-plazes
 %{_libexecdir}/geoclue-skyhook
@@ -177,12 +158,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/geoclue-test-gui
 
-%files gpsd
-%defattr(-,root,root,-)
-%{_libexecdir}/geoclue-gpsd
-%{_datadir}/geoclue-providers/geoclue-gpsd.provider
-%{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
-
 %files gypsy
 %defattr(-,root,root,-)
 %{_libexecdir}/geoclue-gypsy
@@ -196,14 +171,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
 
 %changelog
+* Thu Mar 25 2010 Peter Robinson <pbrobinson at gmail.com> 0.12.0-1
+- New official upstream 0.12.0 release, drop gpsd support
+
 * Fri Jan 29 2010 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.11
 - Fix crashers in geoclue-master provider (#528897)
-
-* Mon Oct 24 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.10
-- Rebuild for new NetworkManager
+- Bump release to be greater than F-12's
 
 * 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
+- New git snapshot, 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geoclue/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	26 Oct 2009 13:22:26 -0000	1.4
+++ sources	28 Jun 2010 13:47:09 -0000	1.5
@@ -1 +1 @@
-6323f039a2ce88bcc71b5cd5f31e4456  geoclue-0.11.1.1-20091026.tar.gz
+33af8307f332e0065af056ecba65fec2  geoclue-0.12.0.tar.gz


--- 0001-Add-error-type-registration.patch DELETED ---


--- 0002-Don-t-lose-special-D-Bus-error-sauce-when-copying.patch DELETED ---


--- geoclue-fixgpsd.patch DELETED ---

More information about the scm-commits mailing list