- rel 11; disable gpsd for now (doesn't build)

Changed files:
    geoclue-unused-var.patch -> 1.1
    geoclue.spec -> 1.23

diff --git a/geoclue-unused-var.patch b/geoclue-unused-var.patch
new file mode 100644 (file)
index 0000000..21c5d05
--- /dev/null
+++ b/geoclue-unused-var.patch
@@ -0,0 +1,14 @@
+diff -up geoclue-0.12.0/src/master-provider.c.blah geoclue-0.12.0/src/master-provider.c
+--- geoclue-0.12.0/src/master-provider.c.blah  2011-03-07 17:32:55.926713653 -0600
++++ geoclue-0.12.0/src/master-provider.c       2011-03-07 17:33:02.177635505 -0600
+@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces
+ static gboolean
+ gc_master_provider_initialize (GcMasterProvider *provider)
+ {
+-      GcMasterProviderPrivate *priv;
+-       
+-      priv = GET_PRIVATE (provider);
+-      
+       if (!gc_master_provider_initialize_interfaces (provider)) {
+               return FALSE;
+       }

diff --git a/geoclue.spec b/geoclue.spec
index ed965696183c2e5329d231dca7227fac612b62a6..8b87d4ef3e81603564fbbced84228d612b4f09c6 100644 (file)
--- a/geoclue.spec
+++ b/geoclue.spec
@@ -1,8 +1,9 @@
+%bcond_with    gps
 Summary:       A modular geoinformation service
 Summary(pl.UTF-8):     Modularna usługa geoinformacyjna
 Name:          geoclue
 Version:       0.12.0
-Release:       10
+Release:       11
 License:       LGPL v2
 Group:         Applications
 Source0:       http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
@@ -10,6 +11,7 @@ Source0:      http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.tar.gz
 Patch0:                %{name}-configure.patch
 Patch1:                %{name}-libsoup.patch
 Patch2:                %{name}-nm09.patch
+Patch3:                geoclue-unused-var.patch
 URL:           http://geoclue.freedesktop.org/
 BuildRequires: GConf2-devel >= 2.0
 BuildRequires: NetworkManager-devel
@@ -18,7 +20,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
@@ -122,6 +124,7 @@ Interfejs geoclue do gypsy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gtkdocize}
@@ -133,7 +136,7 @@ Interfejs geoclue do gypsy.
 %configure \
        --enable-gtk-doc \
        --disable-conic \
-       --enable-gpsd \
+       --enable-gpsd%{?!with_gps:=no} \
        --enable-gypsy \
        --enable-networkmanager \
        --enable-skyhook \
@@ -211,11 +214,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)