From 32e28c388272ce3b978f29aa02db6af6270919325f12a4e4d25de7affaf9fc35 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 2 Feb 2015 16:34:32 +0000
Subject: [PATCH] Accepting request 283766 from
 home:dimstar:branches:GNOME:Factory

- Move ca.desrt.dconf-editor.appdata.xml to dconf-editor
  subpackage: the appdata.xml file is supposed to be in the same
  package as the .desktop file (boo#915692).

OBS-URL: https://build.opensuse.org/request/show/283766
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=77
---
 dconf.changes | 7 +++++++
 dconf.spec    | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dconf.changes b/dconf.changes
index 9a7e912..5a22dcd 100644
--- a/dconf.changes
+++ b/dconf.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb  2 13:53:58 UTC 2015 - dimstar@opensuse.org
+
+- Move ca.desrt.dconf-editor.appdata.xml to dconf-editor
+  subpackage: the appdata.xml file is supposed to be in the same
+  package as the .desktop file (boo#915692).
+
 -------------------------------------------------------------------
 Sun Oct  5 10:20:55 UTC 2014 - zaitor@opensuse.org
 
diff --git a/dconf.spec b/dconf.spec
index 9ba8fee..7e3e1d8 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dconf
 #
-# 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
@@ -190,8 +190,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %{_mandir}/man1/dconf-service.1%{?ext_man}
 # alternative databases
 %{_sysconfdir}/dconf/
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/ca.desrt.dconf-editor.appdata.xml
 
 %files lang -f %{name}.lang
 
@@ -210,6 +208,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %files editor
 %defattr(-, root, root)
 %{_bindir}/dconf-editor
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/ca.desrt.dconf-editor.appdata.xml
 %{_datadir}/applications/ca.desrt.dconf-editor.desktop
 %{_datadir}/dbus-1/services/ca.desrt.dconf-editor.service
 %{_datadir}/glib-2.0/schemas/ca.desrt.dconf-editor.gschema.xml