Author: arekm Date: Sat Jan 28 16:36:47 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 11; disable gpsd for now (doesn't build)
---- Files affected: packages/geoclue: geoclue.spec (1.22 -> 1.23) , geoclue-unused-var.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/geoclue/geoclue.spec diff -u packages/geoclue/geoclue.spec:1.22 packages/geoclue/geoclue.spec:1.23 --- packages/geoclue/geoclue.spec:1.22 Tue Dec 20 20:36:19 2011 +++ packages/geoclue/geoclue.spec Sat Jan 28 17:36:42 2012 @@ -1,9 +1,10 @@ # $Revision$, $Date$ +%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 @@ -11,6 +12,7 @@ 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 @@ -19,7 +21,7 @@ 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 @@ -123,6 +125,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__gtkdocize} @@ -134,7 +137,7 @@ %configure \ --enable-gtk-doc \ --disable-conic \ - --enable-gpsd \ + --enable-gpsd%{?!with_gps:=no} \ --enable-gypsy \ --enable-networkmanager \ --enable-skyhook \ @@ -212,11 +215,13 @@ %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) @@ -230,6 +235,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2012/01/28 16:36:42 arekm +- rel 11; disable gpsd for now (doesn't build) + Revision 1.22 2011/12/20 19:36:19 arekm - release 10 ================================================================ Index: packages/geoclue/geoclue-unused-var.patch diff -u /dev/null packages/geoclue/geoclue-unused-var.patch:1.1 --- /dev/null Sat Jan 28 17:36:47 2012 +++ packages/geoclue/geoclue-unused-var.patch Sat Jan 28 17:36:42 2012 @@ -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; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geoclue/geoclue.spec?r1=1.22&r2=1.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
