use upstream gvim.desktop for base of gvim desktop files

diff --git a/desktop.patch b/desktop.patch
index 898c5b94842a2bf25ace5150b0a9301a18f6f16f..1ace85980b1b8d1e68b5598678dce2e662866ea9 100644 (file)
--- a/desktop.patch
+++ b/desktop.patch
@@ -8,3 +8,133 @@
 +Categories=ConsoleOnly;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++;
+--- vim-7.4.979/gvim-athena.desktop~   2015-12-19 16:28:18.000000000 +0200
++++ vim-7.4.979/gvim-athena.desktop    2015-12-28 08:24:02.106735918 +0200
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=GVim
++Name=GVim Athena
+ GenericName=Text Editor
+ GenericName[de]=Texteditor
+ Comment=Edit text files
+@@ -71,7 +71,7 @@
+ Comment[zh_CN]=编辑文本文件
+ Comment[zh_TW]=編輯文字檔
+-TryExec=gvim
+-Exec=gvim -f %F
++TryExec=gvim.gnome
++Exec=gvim.gnome -f %F
+ Terminal=false
+ Type=Application
+ Icon=gvim
+--- vim-7.4.979/gvim-gnome.desktop~    2015-12-28 08:32:38.000000000 +0200
++++ vim-7.4.979/gvim-gnome.desktop     2015-12-28 08:33:14.285396908 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=GVim
++Name=GVim GNOME
+ GenericName=Text Editor
+ GenericName[de]=Texteditor
+-Comment=Edit text files
++Comment=The vi editor for X Window System with GNOME L&F
+ Comment[af]=Redigeer tekslêers
+ Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
+ Comment[ar]=حرّر ملفات نصية
+@@ -50,7 +50,7 @@
+ Comment[no]=Rediger tekstfiler
+ Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
+ Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
+-Comment[pl]=Edytor plików tekstowych
++Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GNOME
+ Comment[pt]=Editar ficheiros de texto
+ Comment[pt_BR]=Edite arquivos de texto
+ Comment[ro]=Editare fişiere text
+@@ -70,11 +70,11 @@
+ Comment[wa]=Asspougnî des fitchîs tecses
+ Comment[zh_CN]=编辑文本文件
+ Comment[zh_TW]=編輯文字檔
+-TryExec=gvim
+-Exec=gvim -f %F
++TryExec=gvim.gnome
++Exec=gvim.gnome -f %F
+ Terminal=false
+ Type=Application
+ Icon=gvim
+-Categories=Utility;TextEditor;
++Categories=GTK;GNOME;TextEditor;
+ StartupNotify=true
+ 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++;
+--- vim-7.4.979/gvim-gtk.desktop~      2015-12-19 16:28:18.000000000 +0200
++++ vim-7.4.979/gvim-gtk.desktop       2015-12-28 08:29:28.577015888 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=GVim
++Name=GVim GTK
+ GenericName=Text Editor
+ GenericName[de]=Texteditor
+-Comment=Edit text files
++Comment=The vi editor for X Window System with GTK L&F
+ Comment[af]=Redigeer tekslêers
+ Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
+ Comment[ar]=حرّر ملفات نصية
+@@ -50,7 +50,7 @@
+ Comment[no]=Rediger tekstfiler
+ Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
+ Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
+-Comment[pl]=Edytor plików tekstowych
++Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GTK
+ Comment[pt]=Editar ficheiros de texto
+ Comment[pt_BR]=Edite arquivos de texto
+ Comment[ro]=Editare fişiere text
+@@ -70,11 +70,11 @@
+ Comment[wa]=Asspougnî des fitchîs tecses
+ Comment[zh_CN]=编辑文本文件
+ Comment[zh_TW]=編輯文字檔
+-TryExec=gvim
+-Exec=gvim -f %F
++TryExec=gvim.gtk
++Exec=gvim.gtk -f %F
+ Terminal=false
+ Type=Application
+ Icon=gvim
+-Categories=Utility;TextEditor;
++Categories=GTK;TextEditor;
+ StartupNotify=true
+ 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++;
+--- vim-7.4.979/gvim-motif.desktop~    2015-12-19 16:28:18.000000000 +0200
++++ vim-7.4.979/gvim-motif.desktop     2015-12-28 08:31:11.245677767 +0200
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+-Name=GVim
++Name=GVim Motif
+ GenericName=Text Editor
+ GenericName[de]=Texteditor
+-Comment=Edit text files
++Comment=The vi editor for X Window System with Motif L&F
+ Comment[af]=Redigeer tekslêers
+ Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
+ Comment[ar]=حرّر ملفات نصية
+@@ -50,7 +50,7 @@
+ Comment[no]=Rediger tekstfiler
+ Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
+ Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
+-Comment[pl]=Edytor plików tekstowych
++Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja Motif
+ Comment[pt]=Editar ficheiros de texto
+ Comment[pt_BR]=Edite arquivos de texto
+ Comment[ro]=Editare fişiere text
+@@ -70,11 +70,11 @@
+ Comment[wa]=Asspougnî des fitchîs tecses
+ Comment[zh_CN]=编辑文本文件
+ Comment[zh_TW]=編輯文字檔
+-TryExec=gvim
+-Exec=gvim -f %F
++TryExec=gvim.motif
++Exec=gvim.motif -f %F
+ Terminal=false
+ Type=Application
+ Icon=gvim
+-Categories=Utility;TextEditor;
++Categories=Motif;TextEditor;
+ StartupNotify=true
+ 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/gvim-athena.desktop b/gvim-athena.desktop
deleted file mode 100644 (file)
index 8e4faf6..0000000
--- a/gvim-athena.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Gvim Athena
-Comment=The vi editor for X Window System
-Comment[pl]=Edytor vi dla Systemu X Window
-Exec=gvim.athena
-Terminal=false
-Icon=vim
-MimeType=text/plain;
-Type=Application
-Categories=TextEditor;
-# vi: encoding=utf-8

diff --git a/gvim-gnome.desktop b/gvim-gnome.desktop
deleted file mode 100644 (file)
index c5f337e..0000000
--- a/gvim-gnome.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Gvim GNOME
-Comment=The vi editor for X Window System with GNOME L&F
-Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GNOME
-Exec=gvim.gnome
-Terminal=false
-Icon=vim
-MimeType=text/plain;
-Type=Application
-Categories=GTK;GNOME;TextEditor;
-# vi: encoding=utf-8

diff --git a/gvim-gtk.desktop b/gvim-gtk.desktop
deleted file mode 100644 (file)
index 8b4a785..0000000
--- a/gvim-gtk.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Gvim GTK
-Comment=The vi editor for X Window System with GTK L&F
-Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja GTK
-Exec=gvim.gtk
-Terminal=false
-Icon=vim
-MimeType=text/plain;
-Type=Application
-Categories=GTK;TextEditor;
-# vi: encoding=utf-8

diff --git a/gvim-motif.desktop b/gvim-motif.desktop
deleted file mode 100644 (file)
index 45d478e..0000000
--- a/gvim-motif.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Gvim Motif
-Comment=The vi editor for X Window System with Motif L&F
-Comment[pl]=Edytor vi dla Systemu X Window jako aplikacja Motif
-Exec=gvim.motif
-Terminal=false
-Icon=vim
-MimeType=text/plain;
-Type=Application
-Categories=Motif;TextEditor;
-# vi: encoding=utf-8

diff --git a/vim.spec b/vim.spec
index 97214d208829485098c395bd7201abf049858105..2dff81299e7fc9a7c9cca91985ce958e64f93384 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -1,5 +1,3 @@
-# TODO
-# - use upstream gvim.desktop as base for our gvim .desktop files (more translations)
 #
 # Conditional build:
 %bcond_without static          # don't build static version
@@ -55,10 +53,6 @@ Source1:     http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 # Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
 Source2:       http://skawina.eu.org/mikolaj/usr_doc_pl.zip
 # Source2-md5: ff96284b1c913d55cf0877839b34d490
-Source10:      g%{name}-athena.desktop
-Source11:      g%{name}-motif.desktop
-Source12:      g%{name}-gtk.desktop
-Source13:      g%{name}-gnome.desktop
 Source15:      update-source.sh
 # syntax files
 # http://www.vim.org/scripts/script.php?script_id=1491 (0.7.5)
@@ -739,6 +733,12 @@ jak również GUI GTK+2.
 
 %prep
 %setup -q
+
+cp -p runtime/gvim.desktop gvim-athena.desktop
+cp -p runtime/gvim.desktop gvim-gnome.desktop
+cp -p runtime/gvim.desktop gvim-gtk.desktop
+cp -p runtime/gvim.desktop gvim-motif.desktop
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1022,19 +1022,20 @@ ln -sf vi  $RPM_BUILD_ROOT/bin/view
 ln -sf vi  $RPM_BUILD_ROOT/bin/rview
 
 %if %{with athena}
-install -p src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena
-cp -p %{SOURCE10}      $RPM_BUILD_ROOT%{_desktopdir}
+install -p src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena
+cp -p gvim-athena.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with motif}
-install -p src/bin/gvim.motif  $RPM_BUILD_ROOT%{_bindir}/gvim.motif
-cp -p %{SOURCE11}      $RPM_BUILD_ROOT%{_desktopdir}
+install -p src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif
+cp -p gvim-motif.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with gnome}
-install -p src/bin/gvim.gnome  $RPM_BUILD_ROOT%{_bindir}/gvim.gnome
-cp -p %{SOURCE13}      $RPM_BUILD_ROOT%{_desktopdir}
+install -p src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome
+cp -p gvim-gnome.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with gtk}
 install -p src/bin/gvim.gtk    $RPM_BUILD_ROOT%{_bindir}/gvim.gtk
+cp -p gvim-gtk.desktop $RPM_BUILD_ROOT%{_desktopdir}
 ln -sf gvim.gtk                $RPM_BUILD_ROOT%{_bindir}/gvim
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/eview
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/evim
@@ -1042,7 +1043,6 @@ ln -sf gvim               $RPM_BUILD_ROOT%{_bindir}/gview
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/gvimdiff
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/rgview
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/rgvim
-cp -p %{SOURCE12}      $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 %if %{with heavy}
 install -p src/bin/vim.heavy   $RPM_BUILD_ROOT%{_bindir}
@@ -1132,7 +1132,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/rvim.1*
 %lang(ru) %{_mandir}/ru/man1/vim.1*
 %lang(ru) %{_mandir}/ru/man1/vimdiff.1*
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/vim.desktop
 
 %if %{with static}
 %files static