rpms/mpv/F-20 mpv.spec,1.19,1.20 mpv.desktop,1.1,NONE

[Miro Hrončok]

Author: churchyard

Update of /cvs/free/rpms/mpv/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23253

Modified Files:
	mpv.spec 
Removed Files:
	mpv.desktop 
Log Message:
* Wed Jan 01 2014 Miro Hrončok <mhroncok at redhat.com> - 0.3.0-2
- Use upstream .desktop file



Index: mpv.spec
===================================================================
RCS file: /cvs/free/rpms/mpv/F-20/mpv.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mpv.spec	1 Jan 2014 17:03:42 -0000	1.19
+++ mpv.spec	1 Jan 2014 17:48:51 -0000	1.20
@@ -1,11 +1,10 @@
 Name:           mpv
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 License:        GPLv2+
 URL:            http://%{name}.io/
 Source0:        https://github.com/%{name}-player/%{name}/archive/v%{version}.tar.gz
-Source1:        %{name}.desktop
 
 # set defaults for Fedora
 Patch0:         %{name}-config.patch
@@ -79,12 +78,13 @@
 install -Dpm 644 etc/example.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 install -Dpm 644 etc/input.conf %{buildroot}%{_sysconfdir}/%{name}/input.conf
 
-desktop-file-install %{SOURCE1}
+desktop-file-install etc/mpv.desktop
 
 for RES in 16 32 64; do
   install -Dpm 644 etc/mpv-icon-8bit-${RES}x${RES}.png %{buildroot}%{_datadir}/icons/hicolor/${RES}x${RES}/apps/%{name}.png
 done
 
+
 %post
 update-desktop-database &>/dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -113,6 +113,9 @@
 %config(noreplace) %{_sysconfdir}/%{name}/input.conf
 
 %changelog
+* Wed Jan 01 2014 Miro Hrončok <mhroncok at redhat.com> - 0.3.0-2
+- Use upstream .desktop file
+
 * Wed Jan 01 2014 Miro Hrončok <mhroncok at redhat.com> - 0.3.0-1
 - New version 0.3.0
 - Switch to waf


--- mpv.desktop DELETED ---