- update to 0.12.99

[packages/geoclue2.git] / geoclue.spec

diff --git a/geoclue.spec b/geoclue.spec
index dad10b6fd15413524defc118b330b7294f5ebf12..adf47428ea66dee3934e4dfd0433e97ccc3f1c34 100644 (file)
--- a/geoclue.spec
+++ b/geoclue.spec
@@ -1,15 +1,14 @@
+%bcond_with    gps
 Summary:       A modular geoinformation service
 Summary(pl.UTF-8):     Modularna usługa geoinformacyjna
 Name:          geoclue
-Version:       0.12.0
-Release:       9
+Version:       0.12.99
+Release:       1
 License:       LGPL v2
 Group:         Applications
-Source0:       http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
-# Source0-md5: 33af8307f332e0065af056ecba65fec2
-Patch0:                %{name}-configure.patch
-Patch1:                %{name}-libsoup.patch
-Patch2:                %{name}-nm09.patch
+Source0:       http://freedesktop.org/~hadess/%{name}-%{version}.tar.gz
+# Source0-md5: 779245045bfeeec4853da8baaa3a18e6
+Patch0:                %{name}-libsoup.patch
 URL:           http://geoclue.freedesktop.org/
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: NetworkManager-devel
@@ -18,7 +17,7 @@ BuildRequires:        automake >= 1:1.9
 BuildRequires: dbus-glib-devel >= 0.60
 BuildRequires: docbook-dtd412-xml
 BuildRequires: glib2-devel >= 1:2.0
-BuildRequires: gpsd-devel >= 2.91
+%{?with_gps:BuildRequires:     gpsd-devel >= 2.91}
 BuildRequires: gtk+2-devel >= 1:2.0
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: gypsy-devel
@@ -120,8 +119,6 @@ Interfejs geoclue do gypsy.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -133,7 +130,7 @@ Interfejs geoclue do gypsy.
 %configure \
        --enable-gtk-doc \
        --disable-conic \
-       --enable-gpsd \
+       --enable-gpsd%{?!with_gps:=no} \
        --enable-gypsy \
        --enable-networkmanager \
        --enable-skyhook \
@@ -170,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/geoclue-skyhook
 %attr(755,root,root) %{_libexecdir}/geoclue-yahoo
 %dir %{_datadir}/geoclue-providers
+%{_datadir}/GConf/gsettings/geoclue
 %{_datadir}/geoclue-providers/geoclue-example.provider
 %{_datadir}/geoclue-providers/geoclue-geonames.provider
 %{_datadir}/geoclue-providers/geoclue-gsmloc.provider
@@ -180,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geoclue-providers/geoclue-plazes.provider
 %{_datadir}/geoclue-providers/geoclue-skyhook.provider
 %{_datadir}/geoclue-providers/geoclue-yahoo.provider
+%{_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
@@ -211,11 +210,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_gtkdocdir}/geoclue
 
+%if %{with gps}
 %files gpsd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/geoclue-gpsd
 %{_datadir}/geoclue-providers/geoclue-gpsd.provider
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gpsd.service
+%endif
 
 %files gypsy
 %defattr(644,root,root,755)