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