From 574307c13047613686d30192be2400da63a1bca70ff66b5d6927dcaf721787c0 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 13 Feb 2015 20:58:44 +0000 Subject: [PATCH] Accepting request 285875 from home:pluskalm:branches:Application:Geo - Cleanup spec file with spec-cleaner - Update dependencies - Do not try to remove .la files OBS-URL: https://build.opensuse.org/request/show/285875 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geoclue2?expand=0&rev=33 --- geoclue2.changes | 7 +++++++ geoclue2.spec | 17 ++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/geoclue2.changes b/geoclue2.changes index e9e7d33..3a6b34b 100644 --- a/geoclue2.changes +++ b/geoclue2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 12 20:11:11 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Update dependencies +- Do not try to remove .la files + ------------------------------------------------------------------- Sat Oct 4 09:04:06 UTC 2014 - dimstar@opensuse.org diff --git a/geoclue2.spec b/geoclue2.spec index a9f76b1..4c4acd6 100644 --- a/geoclue2.spec +++ b/geoclue2.spec @@ -1,7 +1,7 @@ # # spec file for package geoclue2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -Name: geoclue2 %define _name geoclue %define dbus_user srvGeoClue +Name: geoclue2 Version: 2.1.10 Release: 0 Summary: GeoLocation Framework @@ -29,6 +29,8 @@ Source: http://www.freedesktop.org/software/geoclue/releases/2.1/%{_name # PATCH-FIX-UPSTREAM geoclue2-permit-gnome-maps.patch dimstar@opensuse.org -- Allow gnome-maps to access geoclue Patch0: geoclue2-permit-gnome-maps.patch BuildRequires: intltool >= 0.40.0 +BuildRequires: systemd-rpm-macros +BuildRequires: perl(XML::Parser) BuildRequires: pkgconfig(gio-2.0) >= 2.34.0 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.34.0 BuildRequires: pkgconfig(glib-2.0) >= 2.34.0 @@ -36,10 +38,11 @@ BuildRequires: pkgconfig(json-glib-1.0) >= 0.14 BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(mm-glib) >= 1.0 BuildRequires: pkgconfig(systemd) -# Virtual provides for the dbus service -Provides: dbus(org.freedesktop.GeoClue2) = %{version} +%{?systemd_requires} # we require shadow for useradd Requires(pre): shadow +# Virtual provides for the dbus service +Provides: dbus(org.freedesktop.GeoClue2) = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -68,15 +71,14 @@ communication mechanism to provide location information make %{?_smp_mflags} %install -%make_install -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print +make DESTDIR=%{buildroot} install %{?_smp_mflags} install -d %{buildroot}%{_localstatedir}/lib/%{dbus_user} # Create conveniance shortcut for rcgeoclue -> /usr/sbin/service mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgeoclue %pre -getent passwd %{dbus_user} > /dev/null || useradd -r -g nogroup -d /var/lib/%{dbus_user} -s /sbin/nologin -c "User for GeoClue D-Bus service" %{dbus_user} +getent passwd %{dbus_user} > /dev/null || useradd -r -g nogroup -d %{_localstatedir}/lib/%{dbus_user} -s /sbin/nologin -c "User for GeoClue D-Bus service" %{dbus_user} %service_add_pre geoclue.service %post @@ -111,6 +113,7 @@ getent passwd %{dbus_user} > /dev/null || useradd -r -g nogroup -d /var/lib/%{db %files devel %defattr(-,root,root) +%doc README COPYING %{_libdir}/pkgconfig/geoclue-2.0.pc %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2.Agent.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.GeoClue2.xml