Accepting request 133280 from home:vuntz:branches:GNOME:Factory

suggested tweak

OBS-URL: https://build.opensuse.org/request/show/133280
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-contacts?expand=0&rev=32

gnome-contacts.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep  7 16:01:21 UTC 2012 - vuntz@opensuse.org
+
+- Create a gnome-shell-search-provider-contacts for the GNOME Shell
+  search provider. It will automatically be installed if
+  gnome-contacts and gnome-shell are installed.
+- Add a gnome-shell BuildRequires for directory ownership.
+
 -------------------------------------------------------------------
 Mon Sep  3 12:16:34 UTC 2012 - dimstar@opensuse.org
 

gnome-contacts.spec

@@ -24,11 +24,13 @@ License:        GPL-2.0+
 Group:          Productivity/Office/Other
 Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/gnome-contacts/3.5/%{name}-%{version}.tar.xz
+# For directory ownership
+BuildRequires:  gnome-shell
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.17.2
 BuildRequires:  pkgconfig(cheese-gtk) >= 3.3.5
-BuildRequires:  pkgconfig(folks) >= 0.7.2
+BuildRequires:  pkgconfig(folks) >= 0.7.3
 BuildRequires:  pkgconfig(folks-eds)
 BuildRequires:  pkgconfig(folks-telepathy)
 BuildRequires:  pkgconfig(gdk-x11-3.0)
@@ -50,6 +52,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %description
 The Contacts Manager for GNOME
 
+%package -n gnome-shell-search-provider-contacts
+Summary:        Contacts Manager for GNOME -- Search Provider for GNOME Shell
+Group:          Productivity/Office/Other
+Requires:       %{name} = %{version}
+Requires:       gnome-shell
+Supplements:    packageand(%{name}:gnome-shell)
+
+%description -n gnome-shell-search-provider-contacts
+The Contacts Manager for GNOME
+
+This package contains a search provider to enable GNOME Shell to get
+search results from contacts.
+
 %lang_package
 %prep
 %setup -q
@@ -79,11 +94,11 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/gnome-contacts
 %{_datadir}/applications/gnome-contacts.desktop
-%{_datadir}/dbus-1/services/org.gnome.Contacts.SearchProvider.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Contacts.gschema.xml
-# Own the folders: no need to pull in gnome-shell to build gnome-contacts.
-%dir %{_datadir}/gnome-shell
-%dir %{_datadir}/gnome-shell/search-providers
+
+%files -n gnome-shell-search-provider-contacts
+%defattr(-,root,root)
+%{_datadir}/dbus-1/services/org.gnome.Contacts.SearchProvider.service
 %{_datadir}/gnome-shell/search-providers/gnome-contacts-search-provider.ini
 %{_libexecdir}/gnome-contacts-search-provider