From 6ae471b0c204ba99cb7e3685d34052430db973028bd50d7f89af7454a81ddcb3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 19 Feb 2012 19:11:32 +0000 Subject: [PATCH 1/3] Accepting request 105885 from home:coolo:branches:openSUSE:Factory - vim needs more than what gtk requires - so buildrequire pkgconfig(xt) OBS-URL: https://build.opensuse.org/request/show/105885 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=88 --- vim.changes | 5 +++++ vim.spec | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/vim.changes b/vim.changes index 3ec0a7b..c5e74fe 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 19 19:00:03 UTC 2012 - coolo@suse.com + +- vim needs more than what gtk requires - so buildrequire pkgconfig(xt) + ------------------------------------------------------------------- Fri Dec 23 11:18:17 UTC 2011 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 53bd6ea..40cd546 100644 --- a/vim.spec +++ b/vim.spec @@ -1,7 +1,7 @@ # # spec file for package vim # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vim Version: 7.3 Release: 0 @@ -25,6 +26,9 @@ BuildRequires: fdupes BuildRequires: autoconf BuildRequires: gettext-devel BuildRequires: gtk2-devel +%if 0%{?suse_version} > 1200 +BuildRequires: pkgconfig(xt) +%endif BuildRequires: libacl-devel BuildRequires: ncurses-devel BuildRequires: perl @@ -64,8 +68,8 @@ PreReq: fileutils PreReq: sh-utils PreReq: update-alternatives # -Provides: vim_client Provides: vi +Provides: vim_client # %if 0%{?suse_version} >= 1010 Recommends: vim-data = %{version} From d37297561f58741e3b65ea39dc3274da7c6570889d1b3671cf43beb400cfc30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 28 Feb 2012 13:16:48 +0000 Subject: [PATCH 2/3] - Update to patchlevel 456, fixes the following problems * Using many continuation lines can be slow. * Pasting in the command line is slow. * Undo broken when pasting close to the last line. * Crash when a BufWinLeave autocommand closes the only other window. * ":all!" and ":sall!" give error E477, even though the documentation says these are valid commands. * Vim does not support UTF8_STRING for the X selection. * Compiler warnings to size casts in Perl interface. * Search history lines are duplicated. * "it" and "at" don't work properly with a dash in the tag name. * DBCS encoding in a user command does not always work. * When a user complete function returns -1 an error message is given. * Completion of functions stops once a dictionary is encountered. * Storing a float in a session file has an additional '&'. * Pasting in Visual mode using the "" register does not work. * Multi-byte characters in b:browsefilter are not handled correctly. * ":helpgrep" does not trigger QuickFixCmd* autocommands. * ":cd" doesn't work when the path contains wildcards. * When placing a mark while starting up a screen redraw messes up the screen. * Mapping CTRL-K in Insert mode breaks CTRL-X CTRL-K for dictionary completion. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=89 --- vim-7.3-patches.tar.bz2 | 4 ++-- vim.changes | 30 ++++++++++++++++++++++++++++++ vim.spec | 9 ++++----- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/vim-7.3-patches.tar.bz2 b/vim-7.3-patches.tar.bz2 index c13e3ef..eda20cc 100644 --- a/vim-7.3-patches.tar.bz2 +++ b/vim-7.3-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:952d3169e13434e875588d158ed4da890f3fd0aa2de015593bdd4657fb91cab8 -size 366696 +oid sha256:f7fd00083725faa417f68ff2588009144c052078f1d070a35b417d094a49941d +size 425054 diff --git a/vim.changes b/vim.changes index c5e74fe..7a1d3ab 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Feb 28 12:58:08 UTC 2012 - idonmez@suse.com + +- Update to patchlevel 456, fixes the following problems + * Using many continuation lines can be slow. + * Pasting in the command line is slow. + * Undo broken when pasting close to the last line. + * Crash when a BufWinLeave autocommand closes + the only other window. + * ":all!" and ":sall!" give error E477, even though the + documentation says these are valid commands. + * Vim does not support UTF8_STRING for the X selection. + * Compiler warnings to size casts in Perl interface. + * Search history lines are duplicated. + * "it" and "at" don't work properly + with a dash in the tag name. + * DBCS encoding in a user command does not always work. + * When a user complete function returns -1 an error message + is given. + * Completion of functions stops once a dictionary is encountered. + * Storing a float in a session file has an additional '&'. + * Pasting in Visual mode using the "" register does not work. + * Multi-byte characters in b:browsefilter are not handled correctly. + * ":helpgrep" does not trigger QuickFixCmd* autocommands. + * ":cd" doesn't work when the path contains wildcards. + * When placing a mark while starting up a screen redraw messes up + the screen. + * Mapping CTRL-K in Insert mode breaks CTRL-X CTRL-K for dictionary + completion. + ------------------------------------------------------------------- Sun Feb 19 19:00:03 UTC 2012 - coolo@suse.com diff --git a/vim.spec b/vim.spec index 40cd546..2a97504 100644 --- a/vim.spec +++ b/vim.spec @@ -29,16 +29,15 @@ BuildRequires: gtk2-devel %if 0%{?suse_version} > 1200 BuildRequires: pkgconfig(xt) %endif -BuildRequires: libacl-devel BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: ruby-devel +BuildRequires: systemd BuildRequires: tcl-devel BuildRequires: update-alternatives BuildRequires: update-desktop-files -BuildRequires: systemd # BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 @@ -48,7 +47,7 @@ BuildRequires: gpm %endif # %define pkg_version 7.3 -%define official_ptchlvl 382 +%define official_ptchlvl 456 %define VIM_SUBDIR vim73 %define site_runtimepath /usr/share/vim/site # @@ -220,9 +219,9 @@ Summary: dummy package for a subpackage only build in the buildservice Group: Productivity/Editors/Vi PreReq: %{gvim_prereq} PreReq: update-alternatives -Provides: vim_client Provides: gvim_client Provides: vi +Provides: vim_client %description -n gvim-enhanced dummy package for a subpackage only build in the buildservice @@ -240,8 +239,8 @@ Requires: gvim_client Provides: gvim-base = %{version} Provides: gvim-enhanced = %{version} Provides: gvim_client -Provides: vim_client Provides: vi +Provides: vim_client %description -n gvim Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. From b7068b374ff58eb4af57d50c2a456b85ccac4d983a84f9b70364a1dd77981118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 29 Feb 2012 13:00:36 +0000 Subject: [PATCH 3/3] Accepting request 107547 from home:mvyskocil:branches:editors - remove pointless systemd dependency and run the tmpfiles binary only in case it exists OBS-URL: https://build.opensuse.org/request/show/107547 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=90 --- vim.changes | 6 ++++++ vim.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/vim.changes b/vim.changes index 7a1d3ab..82d10d9 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 29 12:55:57 UTC 2012 - mvyskocil@suse.cz + +- remove pointless systemd dependency and run the tmpfiles binary + only in case it exists + ------------------------------------------------------------------- Tue Feb 28 12:58:08 UTC 2012 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 2a97504..ae9d9fa 100644 --- a/vim.spec +++ b/vim.spec @@ -158,8 +158,6 @@ Summary: Vi IMproved Group: Productivity/Editors/Vi PreReq: %{vim_prereq} PreReq: update-alternatives -# For post script -Requires: systemd %description base Vim (Vi IMproved) is an almost compatible version of the UNIX editor @@ -467,7 +465,9 @@ mkdir -p %{buildroot}/var/run/vi.recover /usr/sbin/update-alternatives --install \ /bin/vim vim %{_datadir}/vim/current/tools/missing-vim-client 0 # Create tmpfiles -/bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/vim.conf +if [ -x /bin/systemd-tmpfiles ]; then + /bin/systemd-tmpfiles --create /usr/lib/tmpfiles.d/vim.conf +fi %post enhanced /usr/sbin/update-alternatives --install \