diff --git a/README.SuSE b/README.SuSE deleted file mode 100644 index a83f5bb..0000000 --- a/README.SuSE +++ /dev/null @@ -1,11 +0,0 @@ -README.SuSE for package 'gvim'. - -This package includes only a new binary with GUI (3D-Athena-Widgets). - -The normal package 'vim' is needed! - -Start: /usr/X11R6/bin/gvim - -Copy and modify some example gvimrc from /usr/share/doc/packages/gvim -to ~/.gvimrc if needed. - diff --git a/vim-7.3-disable_gcc_warning_eval_c.patch b/vim-7.3-disable_gcc_warning_eval_c.patch index 224f2e4..25ce6d7 100644 --- a/vim-7.3-disable_gcc_warning_eval_c.patch +++ b/vim-7.3-disable_gcc_warning_eval_c.patch @@ -1,11 +1,9 @@ -diff -rup vim73.orig/src/eval.c vim73/src/eval.c ---- vim73.orig/src/eval.c 2010-08-09 22:12:14.000000000 +0200 -+++ vim73/src/eval.c 2010-11-22 08:52:10.660213250 +0100 -@@ -10,6 +10,15 @@ - /* +--- vim73/src/eval.c 2011-05-17 09:45:26.743007190 +0200 ++++ vim73/src/eval.c 2011-05-17 09:47:29.964007193 +0200 +@@ -11,6 +11,14 @@ * eval.c: Expression evaluation. */ -+ + +// This workaround disable the GCC compiler warning only in this code file +// because the code is safe. +// http://lists.opensuse.org/opensuse-packaging/2010-11/msg00182.html @@ -14,6 +12,6 @@ diff -rup vim73.orig/src/eval.c vim73/src/eval.c +#define _FORTIFY_SOURCE 1 +#endif + - #if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64) - # include "vimio.h" /* for mch_open(), must be before vim.h */ - #endif + #include "vim.h" + + #if defined(FEAT_EVAL) || defined(PROTO) diff --git a/vim-7.3-patches.tar.bz2 b/vim-7.3-patches.tar.bz2 index 6579113..3dbd22f 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:4a70dc858cbe4976b69666de23d2d64f91156d834be2d854b7ef862f840f51a9 -size 60748 +oid sha256:f7d9c52f0ea9389804295fb2f9ffc987f3859d0a3009a8c4ea4ef9b3478ac2b7 +size 194833 diff --git a/vim.changes b/vim.changes index a93c96c..47c6f87 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 17 07:43:45 UTC 2011 - idoenmez@novell.com + +- Update to official patchlevel 189 +- Drop outdated README.SUSE + ------------------------------------------------------------------- Mon Apr 18 15:00:38 UTC 2011 - idoenmez@novell.com diff --git a/vim.spec b/vim.spec index 43ec4bd..8998303 100644 --- a/vim.spec +++ b/vim.spec @@ -47,7 +47,7 @@ BuildRequires: gpm %endif # %define pkg_version 7.3 -%define official_ptchlvl 127 +%define official_ptchlvl 189 %define VIM_SUBDIR vim73 %define site_runtimepath /usr/share/vim/site # @@ -82,7 +82,6 @@ Source4: vimrc_example1 Source5: vimrc_example2 Source6: ANNOUNCEMENT.vim-%{version} Source8: suse.gvimrc -Source9: README.SuSE Source10: README.Japanese-XIM Source13: vitmp.c Source14: vitmp.1 @@ -285,7 +284,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim #%patch25 %patch27 -p1 %patch100 -p1 -cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE9} %{SOURCE10} . +cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE10} . #rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* #rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no* @@ -429,7 +428,7 @@ install -D -m 0644 \ %{buildroot}%{_docdir}/vim/ # gvim install -D -m 0644 \ - README.SuSE README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \ + README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \ %{buildroot}%{_docdir}/gvim/ # # stupid helper