Accepting request 246800 from editors

1 OBS-URL: https://build.opensuse.org/request/show/246800 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=137
2014-08-30 14:04:02 +00:00 · 2014-08-30 14:04:02 +00:00 · 4d3637e3eb
commit 4d3637e3eb
parent 4b92676608 ebc0ada02d
7 changed files with 101 additions and 35 deletions
--- a/13
+++ b/13
@ -0,0 +1,13 @@
+<services>
+    <service name="tar_scm" mode="disabled">
+        <param name="scm">hg</param>
+        <param name="url">https://code.google.com/p/vim/</param>
+        <param name="filename">vim</param>
+        <param name="versionprefix">7.4.417.hg</param>
+        <param name="revision">v7-4-417</param>
+    </service>
+    <service name="recompress" mode="disabled">
+        <param name="compression">xz</param>
+        <param name="file">vim*.tar</param>
+    </service>
+</services>
--- a/vim-7.3-filetype_spec.patch
+++ b/vim-7.3-filetype_spec.patch
@ -1,7 +1,8 @@
-diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim	2010-08-03 22:44:00.000000000 +0200
-+++ vim73/runtime/filetype.vim	2010-11-21 05:57:07.132983365 +0100
-@@ -1897,7 +1897,7 @@ endfunc
+Index: vim/runtime/filetype.vim
+===================================================================
+--- vim.orig/runtime/filetype.vim
+++ vim/runtime/filetype.vim
+@@ -2038,7 +2038,7 @@ endfunc
 
 
 " Spec (Linux RPM)
@ -10,10 +11,11 @@ diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
 
 " Speedup (AspenTech plant simulator)
 au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
-diff -rup vim73.orig/runtime/syntax/spec.vim vim73/runtime/syntax/spec.vim
--- vim73.orig/runtime/syntax/spec.vim	2010-05-15 13:03:57.000000000 +0200
-+++ vim73/runtime/syntax/spec.vim	2010-11-21 05:57:07.130970392 +0100
-@@ -104,7 +104,7 @@ syn case ignore
+Index: vim/runtime/syntax/spec.vim
+===================================================================
+--- vim.orig/runtime/syntax/spec.vim
+++ vim/runtime/syntax/spec.vim
+@@ -105,7 +105,7 @@ syn case ignore
 "%% PreAmble Section %%
 "Copyright and Serial were deprecated by License and Epoch
 syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
@ -22,12 +24,12 @@ diff -rup vim73.orig/runtime/syntax/spec.vim vim73/runtime/syntax/spec.vim
 
 "%% Description Section %%
 syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
-@@ -113,7 +113,7 @@ syn region specDescriptionArea matchgrou
+@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
 syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
 
 "%% Scripts Section %%
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
-+syn region specScriptArea matchgroup=specSection start='^%\(prep\|check\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|check\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
 
 "%% Changelog Section %%
 syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
--- a/vim-7.4-patches.tar.bz2
+++ b/vim-7.4-patches.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:725d37d7c5e7976d79ced34d823789791e2e6af97b6c1fc0afc98e60402f6d6c
-size 390010
--- a/vim-7.4.417.hg.6162.tar.xz
+++ b/vim-7.4.417.hg.6162.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed397439890e2be12ce7c5ace616f6de4cb935422666562232e6ae96e9310001
+size 7799164
--- a/vim-7.4.tar.bz2
+++ b/vim-7.4.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade
-size 9843297
--- a/vim.changes
+++ b/vim.changes
@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Fri Aug 29 08:01:50 UTC 2014 - coolo@suse.com
+
+- fix license for spdx 1.2
+
+-------------------------------------------------------------------
+Wed Aug 27 12:29:19 UTC 2014 - idonmez@suse.com
+
+- Use a disabled _service file
+- Remove the un-needed Perl hack in the spec file
+
+-------------------------------------------------------------------
+Mon Aug 25 11:05:19 UTC 2014 - idonmez@suse.com
+
+- Use mercurial tags instead of applying patches one by one. This
+  reduces unexpected failures.
+- Updated to revision 417, fixes the following problems
+  * Can't build with Perl on Fedora 20.
+  * Fold does not open after search when there is a CmdwinLeave
+    autocommand.
+  * "foo bar" sorts before "foo" with sort(). (John Little)
+  * Cannot define a command only when it's used.
+  * Cannot build.  Warning for shadowed variable. (John Little)
+  * Problem with breakindent/showbreak and tabs.
+  * After splitting a window and setting 'breakindent' the default
+    minimum with is not respected.
+  * Screen updating is slow when using matches.
+  * Inserting text for Visual block mode, with cursor movement,
+    repeats the wrong text. (Aleksandar Ivanov)
+  * Visual block insert breaks a multi-byte character.
+  * Compiler warning for unused argument and unused variable.
+  * Character after "fb" command not mapped if it might be a composing
+    character.
+  * Test 63 fails when run with GUI-only Vim.
+  * Popup menu flickers too much.
+  * When 'equalalways' is set a split may report "no room" even though
+    there is plenty of room.
+  * Title of quickfist list is not kept for setqflist(list, 'r').
+  * Accessing freed memory after using setqflist(list, 'r'). (Lcd)
+  * Loading python may cause Vim to exit.
+  * Get u_undo error when backspacing in Insert mode deletes more than
+    one line break. (Ayberk Ozgur)
+  * Mapping characters may not work after typing Esc in Insert mode.
+  * Bad interaction between preview window and omnifunc.
+  * Test 102 fails when compiled with small features.
+  * When building with tiny or small features building the .mo files
+    fails.
+  * When splitting a window the changelist position is wrong.
+  * "4gro" replaces one character then executes "ooo". (Urtica Dioica)
+  * With 'linebreak' set and 'list' unset a Tab is not counted
+    properly. (Kent Sibilev)
+  * Still sometimes Vim enters Replace mode when starting up.
+  * Advancing pointer over end of a string.
+  * No 'cursorline' highlighting when the cursor is on a line with
+    diff highlighting. (Benjamin Fritz)
+  * Not easy to detect type of command line window.
+  * C indent is wrong below an if with wrapped condition followed by
+    curly braces. (Trevor Powell)
+  * When 'clipboard' is "unnamed", :g/pat/d is very slow. (Praful)
+  * Matchparen only uses the topmost syntax item.
+  * Encryption implementation is messy.  Blowfish encryption has a
+    weakness.
+  * Test 72 crashes under certain conditions. (Kazunobu Kuriyama)
+  * Valgrind reports errors when running test 72. (Dominique Pelle)
+
 -------------------------------------------------------------------
 Tue Jul 22 09:04:57 UTC 2014 - idonmez@suse.com

--- a/vim.spec
+++ b/vim.spec
@ -17,13 +17,14 @@


 %define pkg_version 7.4
-%define official_ptchlvl 373
+%define patchlevel 417
+%define revision 6162
 %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}

 Name:           vim
-Version:        7.4.%{official_ptchlvl}
+Version:        7.4.%{patchlevel}.hg.%{revision}
 Release:        0
 BuildRequires:  db-devel
 %if 0%{?suse_version} > 1020
@ -69,11 +70,11 @@ Provides:       vim_client
 Recommends:     vim-data = %{version}-%{release}
 %endif
 Summary:        Vi IMproved
-License:        SUSE-Vim
+License:        Vim
 Group:          Productivity/Editors/Vi
 #
 Url:            http://www.vim.org/
-Source:         ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
+Source:         vim-%{version}.tar.xz
 Source3:        suse.vimrc
 Source4:        vimrc_example1
 Source5:        vimrc_example2
@ -86,7 +87,6 @@ Source18:       missing-vim-client
 Source19:       gvim.desktop
 Source20:       spec.skeleton
 Source23:       apparmor.vim
-Source98:       %{name}-7.4-patches.tar.bz2
 Source99:       %{name}-7.4-rpmlintrc
 Patch3:         %{name}-7.4-disable_lang_no.patch
 Patch4:         %{name}-7.3-gvimrc_fontset.patch
@ -167,14 +167,8 @@ You need package vim for the help and other documentation too. If you
 want less features, you might want to install vim instead.

 %prep
-%setup -q -n %{VIM_SUBDIR} -b 98
-for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
-    test -e $p || break
-    test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1
-    echo Patch $p
-    patch -s -p0 < $p
-done
-unset p
+%setup -q
+
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@ -194,11 +188,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch101
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .

-# newer perl? ugly hack to fix build anyway.
-%if 0%{?suse_version} > 1210
-sed -i -e 's/^XS(XS_/XS_INTERNAL(XS_/' src/if_perl.xs
-%endif
-
 %build
 export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"
 export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1}