[geoclue] 0.12.99

Peter Robinson pbrobinson at fedoraproject.org
Tue Jul 31 17:40:46 UTC 2012


commit b08b8caa50f0c6c0a8bef7ca006d1f1bde518822
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jul 31 18:40:36 2012 +0100

    0.12.99

 .gitignore   |    2 +-
 geoclue.spec |   69 +++++++++++++++++++++-------------------------------------
 sources      |    2 +-
 3 files changed, 27 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d35d64..e43429c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-geoclue-0.12.0.tar.gz
+/geoclue-0.*.tar.gz
diff --git a/geoclue.spec b/geoclue.spec
index e876466..aabead4 100644
--- a/geoclue.spec
+++ b/geoclue.spec
@@ -1,17 +1,12 @@
 Name:          geoclue
-Version:       0.12.0
-Release:       11%{?dist}
+Version:       0.12.99
+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
-Patch1:        geoclue-use-libnm-glib.patch
-Patch2:        geoclue-unused-var.patch
-# Remove call to deprecated g_thread_init, fixes build with glib 2.31
-Patch3:        geoclue-0.12.0-g_thread_init.patch
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -25,11 +20,8 @@ BuildRequires: NetworkManager-devel >= 1:0.8.997
 BuildRequires: NetworkManager-glib-devel >= 1:0.8.997
 BuildRequires: gypsy-devel
 BuildRequires: gtk-doc
-Obsoletes: geoclue-gpsd
-
-#Needed for NetworkManager patch
-BuildRequires: libtool
 
+Obsoletes: geoclue-gpsd
 Requires: dbus
 
 %description
@@ -83,25 +75,12 @@ A gsmloc provider for geoclue
 
 %prep
 %setup -q
-%patch0 -p1 -b .nm08
-%patch1 -p1 -b .use-libnm-glib
-%patch2 -p1 -b .unused-var
-%patch3 -p1 -b .g_thread_init
-
-# Remove -Werror from CFLAGS
-sed -i -e '/^CFLAGS/ s/ -Werror//' configure*
-
-# Need this for the NM-0.8 patch
-libtoolize
-gtkdocize
-autoreconf
 
 %build
 %configure --disable-static --enable-gtk-doc --enable-networkmanager=yes --enable-gypsy=yes --enable-skyhook=yes --enable-gsmloc=yes --enable-gpsd=no
 make %{?_smp_mflags} V=1
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #Remove libtool archives.
@@ -111,9 +90,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 mkdir $RPM_BUILD_ROOT%{_bindir}
 cp test/.libs/geoclue-test-gui $RPM_BUILD_ROOT%{_bindir}/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -124,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/geoclue-providers
 %{_libdir}/libgeoclue.so.0
 %{_libdir}/libgeoclue.so.0.0.0
+%{_datadir}/GConf/gsettings/geoclue
+%{_datadir}/glib-2.0/schemas/org.freedesktop.Geoclue.gschema.xml
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Master.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Example.service
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Geonames.service
@@ -181,6 +159,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
 
 %changelog
+* Tue Jul 31 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.12.99-1
+- Update to 0.12.99 devel release
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -206,26 +187,26 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Sat Nov 20 2010 Peter Robinson <pbrobinson at gmail.com> 0.12.0-3
+* Sat Nov 20 2010 Peter Robinson <pbrobinson at fedoraproject.org> 0.12.0-3
 - Add patch for cache_ap_mac crash
 
-* Tue Sep  7 2010 Peter Robinson <pbrobinson at gmail.com> 0.12.0-2
+* Tue Sep  7 2010 Peter Robinson <pbrobinson at fedoraproject.org> 0.12.0-2
 - Add libtoolize to fix the build until we get a new upstream release
 
-* Thu Mar 25 2010 Peter Robinson <pbrobinson at gmail.com> 0.12.0-1
+* Thu Mar 25 2010 Peter Robinson <pbrobinson at fedoraproject.org> 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)
 - 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
+* Mon Oct 24 2009 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1.1-0.9
 - 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
 
-* Thu Jul 23 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.7
+* Thu Jul 23 2009 Peter Robinson <pbrobinson at fedoraproject.org> 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
@@ -234,44 +215,44 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Jun 19 2009 Bastien Nocera <bnocera at redhat.com> 0.11.1.1-0.4
 - Fix geoclue-test-gui (#506921)
 
-* Thu Apr 09 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.3
+* Thu Apr 09 2009 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1.1-0.3
 - Fix install of test gui
 
 * Sun Mar 29 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.11.1.1-0.2
 - Rebuild for new gpsd
 
-* Tue Mar 10 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1.1-0.1
+* Tue Mar 10 2009 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1.1-0.1
 - Move to a git snapshot until we finally get a new stable release
 
-* Wed Mar 4 2009 Peter Robinson <pbrobinson at gmail.com> 0.11.1-15
+* Wed Mar 4 2009 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-15
 - Move docs to noarch, a few spec file cleanups
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Nov 22 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-13
+* Sat Nov 22 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-13
 - Fix summary
 
-* Thu Jul 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-12
+* Thu Jul 31 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-12
 - Once more for fun
 
-* Thu Jul 31 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-11
+* Thu Jul 31 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-11
 - Increment build number to allow for clean F-8 and F-9 to F-10 upgrade
 
-* Wed Jul 2 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-6
+* Wed Jul 2 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-6
 - Fixed spec file so gpsd and gypsy are actually properly in a subpackage
 
-* Sun May 18 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-5
+* Sun May 18 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-5
 - Added gypsy and gpsd providers to build as sub packages
 
-* Mon Apr 28 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-4
+* Mon Apr 28 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-4
 - Moved api documentation to -devel
 
-* Sat Apr 26 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-3
+* Sat Apr 26 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-3
 - Cleanup requires and group for test gui
 
-* Sat Apr 26 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-2
+* Sat Apr 26 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-2
 - Some spec file cleanups
 
-* Fri Apr 25 2008 Peter Robinson <pbrobinson at gmail.com> 0.11.1-1
+* Fri Apr 25 2008 Peter Robinson <pbrobinson at fedoraproject.org> 0.11.1-1
 - Initial package
diff --git a/sources b/sources
index 7b68603..89ec3c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33af8307f332e0065af056ecba65fec2  geoclue-0.12.0.tar.gz
+779245045bfeeec4853da8baaa3a18e6  geoclue-0.12.99.tar.gz


More information about the scm-commits mailing list