Accepting request 253090 from editors

- Updated to revision 461, fixes the following problems
  * When using a Visual selection of multiple words and doing CTRL-W_]
    it jumps to the tag matching the word under the cursor, not the
    selected text.  (Patrick hemmer)
  * Completion for :buf does not use 'wildignorecase'. (Akshay H)
  * 'backupcopy' is global, cannot write only some files in a
    different way.
  * Using getchar() in an expression mapping may result in K_CURSORHOLD, 
    which can't be recognized.
  * Issue 252: Cursor moves in a zero-height window.
  * Can't change the icon after building Vim.
  * Can't build without the quickfix feature. (Erik Falor) 
  * Error reported by ubsan when running test 72.
  * Reversed question mark not recognized as punctuation. (Issue 258)
  * Clipboard may be cleared on startup.
  * In some situations, when setting up an environment to trigger an
    autocommand, the environment is not properly restored.
  * Spell files from Hunspell may generate a lot of errors.
  * Using ETO_IGNORELANGUAGE causes problems.
  * Can't easily close the help window. (Chris Gaal)
  * Not all commands that edit another buffer support the +cmd
    argument.
  * Calling system() with empty input gives an error for writing the
    temp file.

- Add gvim.svg as Source24, taken from gnome-colors-icon-theme.
  Convert the svg to all relevant hicolor sizes, and install them.
- Add rsvg-view BuildRequires: Needed to do the above conversion.
- Call relevant macros in %post/%postun:
  + %icon_theme_cache_post/postun because the package ships themed

OBS-URL: https://build.opensuse.org/request/show/253090
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=140

.gitattributes

@@ -21,3 +21,5 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
+## Specific LFS patterns
+gvim.svg filter=lfs diff=lfs merge=lfs -text

_service

@@ -1,10 +1,10 @@
 <services>
     <service name="tar_scm" mode="disabled">
         <param name="scm">hg</param>
-        <param name="url">https://code.google.com/p/vim/</param>
+        <param name="url">https://code.google.com/p/vim</param>
         <param name="filename">vim</param>
-        <param name="versionprefix">7.4.442.hg</param>
+        <param name="versionprefix">7.4.461.hg</param>
-        <param name="revision">v7-4-442</param>
+        <param name="revision">v7-4-461</param>
     </service>
     <service name="recompress" mode="disabled">
         <param name="compression">xz</param>

gvim.svg

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de721437216546d343c9a6d920495c84f6ed8c56e9388d828a48cc7d3f8e89a3
+size 9566

vim-7.4.442.hg.6214.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9796bc34abdfddcba5f65ce7171ca505c842ee219dc0ec4c24daed79f85b6183
-size 7799824

vim-7.4.461.hg.6253.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64d1e4c23773b19496a5758375bb12b9650bddf1ebef44869bfc78ec268fb228
+size 7742068

vim.changes

@@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Mon Sep 29 11:28:00 UTC 2014 - idonmez@suse.com
+
+- Updated to revision 461, fixes the following problems
+  * When using a Visual selection of multiple words and doing CTRL-W_]
+    it jumps to the tag matching the word under the cursor, not the
+    selected text.  (Patrick hemmer)
+  * Completion for :buf does not use 'wildignorecase'. (Akshay H)
+  * 'backupcopy' is global, cannot write only some files in a
+    different way.
+  * Using getchar() in an expression mapping may result in K_CURSORHOLD, 
+    which can't be recognized.
+  * Issue 252: Cursor moves in a zero-height window.
+  * Can't change the icon after building Vim.
+  * Can't build without the quickfix feature. (Erik Falor) 
+  * Error reported by ubsan when running test 72.
+  * Reversed question mark not recognized as punctuation. (Issue 258)
+  * Clipboard may be cleared on startup.
+  * In some situations, when setting up an environment to trigger an
+    autocommand, the environment is not properly restored.
+  * Spell files from Hunspell may generate a lot of errors.
+  * Using ETO_IGNORELANGUAGE causes problems.
+  * Can't easily close the help window. (Chris Gaal)
+  * Not all commands that edit another buffer support the +cmd
+    argument.
+  * Calling system() with empty input gives an error for writing the
+    temp file.
+
+-------------------------------------------------------------------
+Fri Sep 26 09:51:50 UTC 2014 - zaitor@opensuse.org
+
+- Add gvim.svg as Source24, taken from gnome-colors-icon-theme.
+  Convert the svg to all relevant hicolor sizes, and install them.
+- Add rsvg-view BuildRequires: Needed to do the above conversion.
+- Call relevant macros in %post/%postun:
+  + %icon_theme_cache_post/postun because the package ships themed
+    icons.
+
 -------------------------------------------------------------------
 Fri Sep 12 12:39:19 UTC 2014 - opensuse@cboltz.de
 

vim.spec

@@ -17,8 +17,8 @@
 
 
 %define pkg_version 7.4
-%define patchlevel 442
+%define patchlevel 461
-%define revision 6214
+%define revision 6253
 %define VIM_SUBDIR vim74
 %define site_runtimepath /usr/share/vim/site
 %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags}
@@ -44,6 +44,8 @@ BuildRequires:  perl
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  python3-devel
+# Needed to convert svg to png
+BuildRequires:  rsvg-view
 BuildRequires:  ruby-devel
 BuildRequires:  update-desktop-files
 #
@@ -87,6 +89,7 @@ Source18:       missing-vim-client
 Source19:       gvim.desktop
 Source20:       spec.skeleton
 Source23:       apparmor.vim
+Source24:       gvim.svg
 Source99:       %{name}-7.4-rpmlintrc
 Patch3:         %{name}-7.4-disable_lang_no.patch
 Patch4:         %{name}-7.3-gvimrc_fontset.patch
@@ -239,9 +242,15 @@ sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
 gcc %{optflags} %{SOURCE13} -o vitmp
 
 %install
-# create icon directory to have the icon from the tarball installed
-install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
 %makeinstall STRIP=:
+# create icon directory to have the icons installed and convert them to all hicolor expected sizes.
+for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do
+  SIZE=$(echo $size | awk -Fx {'print $2}')
+  install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps
+  rsvg-convert -h ${SIZE} -w ${SIZE} %{S:24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png
+done
+install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+install -m 0644 %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/gvim.svg
 
 # the last installed binary is gvim. preserve it and
 # fix its symlinks. e* was added here as it doesnt make much sense in
@@ -342,6 +351,12 @@ trap "printf '\e[r'" EXIT
 # Look for "TEST FAILURE" in the build log
 make test
 
+%post -n gvim
+%icon_theme_cache_post
+
+%postun -n gvim
+%icon_theme_cache_postun
+
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/vimrc
@@ -489,7 +504,7 @@ make test
 %{_bindir}/rgvim
 # menu icon
 %{_datadir}/applications/gvim.desktop
-%{_datadir}/icons/hicolor/48x48/apps/gvim.png
+%{_datadir}/icons/hicolor/*/apps/gvim.*
 %doc %{_docdir}/gvim
 
 %changelog