From 17bc9d1579c45544d174a59fcd5a44daa10deae6597c674e0ffc99412bdf4bb4 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 1 Jun 2016 14:37:14 +0000 Subject: [PATCH] Accepting request 399499 from GNOME:Factory 1 OBS-URL: https://build.opensuse.org/request/show/399499 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/geoclue2?expand=0&rev=48 --- geoclue2-rpmlintrc | 6 ++++++ geoclue2.changes | 15 ++++++++++++++- geoclue2.spec | 8 +++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 geoclue2-rpmlintrc diff --git a/geoclue2-rpmlintrc b/geoclue2-rpmlintrc new file mode 100644 index 0000000..c4ac20a --- /dev/null +++ b/geoclue2-rpmlintrc @@ -0,0 +1,6 @@ +addFilter("W: systemd-service-without-service_del_preun") +addFilter("W: systemd-service-without-service_del_postun") +addFilter("W: systemd-service-without-service_add_pre") +addFilter("W: systemd-service-without-service_add_post") +addFilter("W: non-standard-uid /var/lib/srvGeoClue srvGeoClue") + diff --git a/geoclue2.changes b/geoclue2.changes index b1b6513..910f087 100644 --- a/geoclue2.changes +++ b/geoclue2.changes @@ -1,8 +1,21 @@ +------------------------------------------------------------------- +Mon May 30 15:48:31 UTC 2016 - zaitor@opensuse.org + +- Add geoclue2-rpmlintrc to sources to filter out bogus rpmlint + warning about missing systemd-service and nonstandard user. +- Add missing post/postun handling of library. +- Remove useless desktop file for demos, we do not build the demos. + ------------------------------------------------------------------- Mon May 30 13:00:24 UTC 2016 - fcrozat@suse.com - Do not use systemd macros for geoclue2.service, they are not - designed for dbus systemd unit file. + designed for dbus systemd unit file [bsc#982216]. + +------------------------------------------------------------------- +Wed Apr 13 09:27:42 UTC 2016 - idonmez@suse.com + +- Update to GNOME 3.20 Fate#318572 ------------------------------------------------------------------- Thu Mar 3 13:39:24 UTC 2016 - zaitor@opensuse.org diff --git a/geoclue2.spec b/geoclue2.spec index fd8a2c1..fd78be9 100644 --- a/geoclue2.spec +++ b/geoclue2.spec @@ -26,6 +26,7 @@ License: GPL-2.0+ Group: System/Libraries Url: http://people.freedesktop.org/~zeenix/releases/ Source: http://www.freedesktop.org/software/geoclue/releases/2.4/%{_name}-%{version}.tar.xz +Source99: geoclue2-rpmlintrc # PATCH-FIX-UPSTREAM geoclue2-permit-gnome-maps.patch dimstar@opensuse.org -- Allow gnome-maps to access geoclue Patch0: geoclue2-permit-gnome-maps.patch BuildRequires: gtk-doc @@ -93,12 +94,18 @@ install -d %{buildroot}%{_localstatedir}/lib/%{dbus_user} mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgeoclue find %{buildroot} -type f -name "*.la" -delete -print +# Remove desktop file, we do not build the demos +find %{buildroot} -type f -name "geoclue-demo-agent.desktop" -delete -print %pre 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} # note: do not use systemd macros for geoclue2.service, they are not meant for dbus unit files. +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %doc README COPYING @@ -108,7 +115,6 @@ getent passwd %{dbus_user} > /dev/null || useradd -r -g nogroup -d %{_localstate %{_libexecdir}/geoclue %dir %{_libexecdir}/geoclue-2.0/ %{_libexecdir}/geoclue-2.0/demos/ -%{_datadir}/applications/geoclue-demo-agent.desktop %{_datadir}/applications/geoclue-where-am-i.desktop %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/interfaces