From 29f5e433684f33741c418c264f1437bbaee8a09633b76b71f36ca2bd4f64ba30 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 3 Apr 2018 14:46:18 +0000 Subject: [PATCH 1/2] Accepting request 593259 from home:kukuk:branches:editors - Use %license instead of %doc [bsc#1082318] OBS-URL: https://build.opensuse.org/request/show/593259 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=492 --- vim.changes | 5 +++++ vim.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vim.changes b/vim.changes index 1bbd400..2a48032 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 3 15:34:22 CEST 2018 - kukuk@suse.de + +- Use %license instead of %doc [bsc#1082318] + ------------------------------------------------------------------- Fri Mar 23 12:15:38 UTC 2018 - lnussel@suse.de diff --git a/vim.spec b/vim.spec index 1ca3b0b..5d0e7e2 100644 --- a/vim.spec +++ b/vim.spec @@ -306,7 +306,7 @@ install -d -m 0755 %{buildroot}%{_docdir}/{,g}vim/ cp runtime/doc/uganda.txt LICENSE install -D -m 0644 \ vimrc_example1 vimrc_example2 suse.vimrc \ - LICENSE README.txt READMEdir/README_src.txt READMEdir/README_unix.txt \ + README.txt READMEdir/README_src.txt READMEdir/README_unix.txt \ %{buildroot}%{_docdir}/vim/ # gvim install -D -m 0644 \ @@ -415,6 +415,7 @@ fi %dir %{_mandir}/ja/man1/ %{_mandir}/ja/man1/* # docs and data file +%license LICENSE %doc %{_docdir}/vim # %{_datadir}/vim/current From 9fa0824b67843b00c3a86e103eeba22e01b5a3c7d52eb667f53fc039dc604386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 4 Apr 2018 13:26:00 +0000 Subject: [PATCH 2/2] 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 | 4 ++-- gvim_24.png | 3 +++ gvim_32.png | 3 +++ gvim_48.png | 3 +++ gvim_64.png | 3 +++ gvim_96.png | 3 +++ vim.changes | 8 ++++++++ vim.spec | 22 ++++++++++++---------- 8 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 gvim_24.png create mode 100644 gvim_32.png create mode 100644 gvim_48.png create mode 100644 gvim_64.png create mode 100644 gvim_96.png diff --git a/gvim.svg b/gvim.svg index ce39950..079c44d 100644 --- a/gvim.svg +++ b/gvim.svg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de721437216546d343c9a6d920495c84f6ed8c56e9388d828a48cc7d3f8e89a3 -size 9566 +oid sha256:946dce274e5051e4853cb1bf3483966bb349cd2a9e575af7e773c1ffdcaff749 +size 11400 diff --git a/gvim_24.png b/gvim_24.png new file mode 100644 index 0000000..378d3a3 --- /dev/null +++ b/gvim_24.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d203547ea1a77a3202cceda1b017a54628250e2f0443e8d947146387145eaa09 +size 1687 diff --git a/gvim_32.png b/gvim_32.png new file mode 100644 index 0000000..98fe830 --- /dev/null +++ b/gvim_32.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f1c006a109948927f594b3915999ed80293e0b592a7706efafedb212411be3c +size 2433 diff --git a/gvim_48.png b/gvim_48.png new file mode 100644 index 0000000..5e0d20c --- /dev/null +++ b/gvim_48.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7620817e07ddab0ae17a5cb7bddeda01a42119c9863aacb48f37f1784b17f22 +size 3907 diff --git a/gvim_64.png b/gvim_64.png new file mode 100644 index 0000000..bd4a95f --- /dev/null +++ b/gvim_64.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b498011da6e6641951421a79de2e1c6ed4977d08a82afc14538e957c806d7544 +size 6070 diff --git a/gvim_96.png b/gvim_96.png new file mode 100644 index 0000000..738652d --- /dev/null +++ b/gvim_96.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8fc3d48d94761e5e255c76c7ddee31b7ef5c0cde8c919cf92a3a0c08ec58390 +size 9798 diff --git a/vim.changes b/vim.changes index 2a48032..5c2de12 100644 --- a/vim.changes +++ b/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 diff --git a/vim.spec b/vim.spec index 5d0e7e2..a958f35 100644 --- a/vim.spec +++ b/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. -for size in %{_datadir}/icons/hicolor/*[0-9]x[0-9]*; do - SIZE=$(echo $size | awk -Fx {'print $2}') +# create icon directories and install the icons into it +for SIZE in 24 32 48 64 96; do 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