up to 0.3.1; use upstream desktop file

diff --git a/desktop.patch b/desktop.patch
new file mode 100644 (file)
index 0000000..f901475
--- /dev/null
+++ b/desktop.patch
@@ -0,0 +1,10 @@
+--- neovim-0.3.1/runtime/nvim.desktop~ 2018-07-18 14:44:59.000000000 +0300
++++ neovim-0.3.1/runtime/nvim.desktop  2018-12-23 13:37:35.952940536 +0200
+@@ -76,6 +76,6 @@
+ Type=Application
+ Keywords=Text;editor;
+ Icon=nvim
+-Categories=Utility;TextEditor;
++Categories=ConsoleOnly;Application;Utility;TextEditor;
+ StartupNotify=false
+ MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;

diff --git a/neovim.desktop b/neovim.desktop
deleted file mode 100644 (file)
index be105d6..0000000
--- a/neovim.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Neovim
-Categories=ConsoleOnly;Application;Utility;TextEditor;
-GenericName=Text Editor
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=xdg-terminal "nvim %f"
-Icon=neovim
-Type=Application
-Terminal=false

diff --git a/neovim.spec b/neovim.spec
index 8e285b4754f178828a027507832407c0896a8825..9e1f1cc5e8afb1284f05dd632bae20f59a9803e3 100644 (file)
--- a/neovim.spec
+++ b/neovim.spec
@@ -8,15 +8,16 @@
 
 Summary:       Vim-fork focused on extensibility and agility
 Name:          neovim
-Version:       0.2.2
+Version:       0.3.1
 Release:       1
 License:       Apache v2.0
 Group:         Applications/Editors/Vim
+# Source0Download: https://github.com/neovim/neovim/releases
 Source0:       https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 44b69f8ace88b646ec890670f1e462c4
+# Source0-md5: 5405bced1c929ebc245c75409cd6c7ef
 URL:           https://neovim.io/
-Source1:       %{name}.desktop
 Source2:       %{name}.svg
+Patch0:                desktop.patch
 BuildRequires: cmake >= 2.8.7
 BuildRequires: gcc >= 6:4.4
 BuildRequires: gettext-devel
@@ -99,10 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{/etc/xdg/nvim,%{_desktopdir},%{_iconsdir}/hicolor/scalable/apps}
+install -d $RPM_BUILD_ROOT{/etc/xdg/nvim,%{_iconsdir}/hicolor/scalable/apps}
 touch $RPM_BUILD_ROOT/etc/xdg/nvim/init.vim
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/neovim.desktop
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/neovim.svg
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/nvim.svg
 
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cs.cp1250
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ja.euc-jp
@@ -149,7 +149,8 @@ EOF
 %dir /etc/xdg/nvim
 %config(noreplace) %verify(not md5 mtime size) /etc/xdg/nvim/init.vim
 %attr(755,root,root) %{_bindir}/nvim
-%{_datadir}/nvim
-%{_desktopdir}/%{name}.desktop
-%{_iconsdir}/hicolor/*/apps/%{name}.svg
 %{_mandir}/man1/nvim.1*
+%{_datadir}/nvim
+%{_desktopdir}/nvim.desktop
+%{_pixmapsdir}/nvim.png
+%{_iconsdir}/hicolor/*/apps/nvim.svg