Accepting request 593350 from home:StefanBruens:branches:openSUSE:Factory

- Pre-convert gvim icons, otherwise building vim depends on
  rsvg-convert -> librsvg -> cargo -> Rust -> LLVM
- Cleanup SVG icon, make lines pixel-grid aligned
- Correct RPM Group

OBS-URL: https://build.opensuse.org/request/show/593350
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=493

gvim.svg

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

gvim_24.png

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

gvim_32.png

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

gvim_48.png

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

gvim_64.png

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

gvim_96.png

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

vim.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr  4 00:00:57 UTC 2018 - stefan.bruens@rwth-aachen.de
+
+- Pre-convert gvim icons, otherwise building vim depends on
+  rsvg-convert -> librsvg -> cargo -> Rust -> LLVM
+- Cleanup SVG icon, make lines pixel-grid aligned
+- Correct RPM Group
+
 -------------------------------------------------------------------
 Tue Apr  3 15:34:22 CEST 2018 - kukuk@suse.de
 

vim.spec

@@ -28,7 +28,7 @@ Version:        %{pkg_version}.%{patchlevel_compact}
 Release:        0
 Summary:        Vi IMproved
 License:        Vim
-Group:          Productivity/Editors/Vi
+Group:          Productivity/Text/Editors
 Url:            http://www.vim.org/
 Source:         https://github.com/vim/vim/archive/v%{pkg_version}.%{patchlevel}.tar.gz#/vim-%{pkg_version}.%{patchlevel}.tar.gz
 Source3:        suse.vimrc
@@ -43,6 +43,11 @@ Source19:       gvim.desktop
 Source20:       spec.skeleton
 Source23:       apparmor.vim
 Source24:       gvim.svg
+Source25:       gvim_24.png
+Source26:       gvim_32.png
+Source27:       gvim_48.png
+Source28:       gvim_64.png
+Source29:       gvim_96.png
 Source99:       %{name}-7.4-rpmlintrc
 Patch3:         %{name}-7.4-disable_lang_no.patch
 Patch4:         %{name}-7.3-gvimrc_fontset.patch
@@ -74,8 +79,6 @@ BuildRequires:  pkgconfig
 %if %{with python2}
 BuildRequires:  python2-devel
 %endif
-# Needed to convert svg to png
-BuildRequires:  rsvg-view
 BuildRequires:  ruby-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -107,7 +110,7 @@ file name completion, block operations, and editing of binary data.
 %package data
 Summary:        Data files needed for extended vim functionality
 # Used to be in vim-plugins package
-Group:          Productivity/Editors/Vi
+Group:          Productivity/Text/Editors
 Obsoletes:      vim-plugin-matchit <= 1.13.2
 Provides:       vim-plugin-matchit = 1.13.2
 Requires:       vim-data-common = %{version}-%{release}
@@ -118,7 +121,7 @@ This package contains optional runtime & syntax files for vim.
 
 %package data-common
 Summary:        Common Data files for vim & gvim
-Group:          Productivity/Editors/Vi
+Group:          Productivity/Text/Editors
 BuildArch:      noarch
 
 %description data-common
@@ -126,7 +129,7 @@ This package contains common runtime & syntax files for vim and gvim.
 
 %package -n gvim
 Summary:        A GUI for Vi
-Group:          Productivity/Editors/Vi
+Group:          Productivity/Text/Editors
 Requires:       gvim_client
 Requires:       vim-data = %{version}-%{release}
 Requires(post): update-alternatives
@@ -235,11 +238,10 @@ gcc %{optflags} %{SOURCE13} -o vitmp
 
 %install
 %make_install STRIP=:
-# create icon directory to have the icons installed and convert them to all hicolor expected sizes.
+# create icon directories and install the icons into it
-for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do
+for SIZE in 24 32 48 64 96; 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} %{SOURCE24} -o %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/gvim.png
+  install -m 0644 %{_sourcedir}/gvim_${SIZE}.png %{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