From eeaccc484c1a44d05d32eea8f9e3eb0b5dd9ccc0515d6cd2a4dc1dd89b29275b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 17 Mar 2015 16:05:17 +0000
Subject: [PATCH 1/2] move icon to -noX

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=115
---
 vlc.changes | 6 ++++++
 vlc.spec    | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/vlc.changes b/vlc.changes
index 3ccd693..86502f7 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 17 15:21:39 UTC 2015 - dimstar@opensuse.org
+
+- Move /usr/share/pixmaps/vlc.png to vlc-noX, to be next to the
+  .desktop file.
+
 -------------------------------------------------------------------
 Wed Mar  4 11:09:14 UTC 2015 - dimstar@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index 21f0ee2..21394a7 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -438,7 +438,8 @@ echo '********* ENTERED INSTALL PHASE *********'
 date
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 mkdir -p %{buildroot}/%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
+# We need a full copy, as the pixmap icon goes to the -noX package
+cp %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
 find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file vlc AudioVideo Audio Video Player
 %fdupes %{buildroot}%{_datadir}/vlc
@@ -481,7 +482,6 @@ done
 %files
 %defattr(-,root,root)
 %{_bindir}/svlc
-%{_datadir}/pixmaps/vlc.png
 %{_datadir}/icons/hicolor/*/apps/vlc*
 %dir %{_datadir}/kde4
 %dir %{_datadir}/kde4/apps
@@ -526,6 +526,8 @@ done
 %doc NEWS AUTHORS COPYING THANKS README
 # The .desktop file does not imply a dependeny on X; so let's keep it here
 %{_datadir}/applications/vlc.desktop
+# The icon is the one referenced by the .desktop file
+%{_datadir}/pixmaps/vlc.png
 %{_bindir}/cvlc
 %if 0%{?suse_version} >= 1320
 %{_bindir}/nvlc

From 0d50b71c0c56fe06b76797d711e24d8aea7955827dbd5d3e6101408042f45f08 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 17 Mar 2015 16:27:41 +0000
Subject: [PATCH 2/2] fixuop

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=116
---
 vlc.changes | 6 ++++--
 vlc.spec    | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/vlc.changes b/vlc.changes
index 86502f7..3523707 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,8 +1,10 @@
 -------------------------------------------------------------------
 Tue Mar 17 15:21:39 UTC 2015 - dimstar@opensuse.org
 
-- Move /usr/share/pixmaps/vlc.png to vlc-noX, to be next to the
-  .desktop file.
+- Move vlc.desktop vlc package: AppStream bases the addition of
+  packages to the store based on the .desktop file (which
+  identifies the application). In case of VLC, we want to present
+  'the full set' as part of the App Stores.
 
 -------------------------------------------------------------------
 Wed Mar  4 11:09:14 UTC 2015 - dimstar@opensuse.org
diff --git a/vlc.spec b/vlc.spec
index 21394a7..277cb9d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -481,6 +481,11 @@ done
 
 %files
 %defattr(-,root,root)
+# The presence of the .desktop file is what gives AppStream the
+# hint of which package to add in the appstore... 'vlc' is the place to be
+%{_datadir}/applications/vlc.desktop
+# The icon is the one referenced by the .desktop file
+%{_datadir}/pixmaps/vlc.png
 %{_bindir}/svlc
 %{_datadir}/icons/hicolor/*/apps/vlc*
 %dir %{_datadir}/kde4
@@ -524,10 +529,6 @@ done
 %defattr(-,root,root)
 %doc %{_datadir}/doc/vlc/
 %doc NEWS AUTHORS COPYING THANKS README
-# The .desktop file does not imply a dependeny on X; so let's keep it here
-%{_datadir}/applications/vlc.desktop
-# The icon is the one referenced by the .desktop file
-%{_datadir}/pixmaps/vlc.png
 %{_bindir}/cvlc
 %if 0%{?suse_version} >= 1320
 %{_bindir}/nvlc