OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=20

2007-10-04 22:39:30 +00:00 · 2007-10-04 22:39:30 +00:00 · aab6479323
commit aab6479323
parent c3e9c71da0
6 changed files with 29 additions and 64 deletions
--- a/7.1.039
+++ b/7.1.039
@ -1,39 +0,0 @@
-To: vim-dev@vim.org
-Subject: patch 7.1.039
-Fcc: outbox
-From: Bram Moolenaar <Bram@moolenaar.net>
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 8bit
------------
-
-Patch 7.1.039
-Problem:    A tag in a help file that starts with "help-tags" and contains a
-	    percent sign may make Vim crash. (Ulf Harnhammar)
-Solution:   Use puts() instead of fprintf().
-Files:	    src/ex_cmds.c
-
-
-*** ../vim-7.1.038/src/ex_cmds.c	Tue Jul 24 11:15:46 2007
--- src/ex_cmds.c	Wed Jul 25 20:06:20 2007
-***************
-*** 6374,6382 ****
-  	for (i = 0; i < ga.ga_len; ++i)
-  	{
-  	    s = ((char_u **)ga.ga_data)[i];
-! 	    if (STRNCMP(s, "help-tags", 9) == 0)
-  		/* help-tags entry was added in formatted form */
-! 		fprintf(fd_tags, (char *)s);
-  	    else
-  	    {
-  		fprintf(fd_tags, "%s\t/*", s);
--- 6374,6382 ----
-  	for (i = 0; i < ga.ga_len; ++i)
-  	{
-  	    s = ((char_u **)ga.ga_data)[i];
-! 	    if (STRNCMP(s, "help-tags\t", 10) == 0)
-  		/* help-tags entry was added in formatted form */
-! 		fputs((char *)s, fd_tags);
-  	    else
-  	    {
-  		fprintf(fd_tags, "%s\t/*", s);
--- a/vim-7.1-diff_check.patch
+++ b/vim-7.1-diff_check.patch
@ -75,19 +75,12 @@ Index: vim71/src/diff.c
 
 #ifdef FEAT_EVAL
     if (*p_dex != NUL)
-@@ -842,13 +853,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
+@@ -842,7 +853,7 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
 #ifdef FEAT_AUTOCMD
- 	    ++autocmd_block;	/* Avoid ShellCmdPost stuff */
+ 	    block_autocmds();	/* Avoid ShellCmdPost stuff */
 #endif
 -	    (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
 +	    retval = call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
 #ifdef FEAT_AUTOCMD
- 	    --autocmd_block;
+ 	    unblock_autocmds();
 #endif
- 	    vim_free(cmd);
- 	}
-     }
-+    return retval;
- }
- 
- /*
--- a/vim-7.1-rpmlintrc
+++ b/vim-7.1-rpmlintrc
@ -1,3 +1,4 @@
 addFilter("vim-data devel-file-in-non-devel-package")
 addFilter("vim-data file-not-in-%lang")
+addFilter("vim-base package-with-huge-docs")

--- a/vim-upstream-patches-7.1-135.patch.bz2
+++ b/vim-upstream-patches-7.1-135.patch.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75cf4e485a565586d1a535c4d6fc151a865bfece72ebf2de11247ec4083b5b4d
+size 102624
--- a/vim.changes
+++ b/vim.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct  4 15:19:43 CEST 2007 - mkoenig@suse.de
+
+- fix alternatives problem which resulted from linking to the
+  dummy script in install process [#305790]
+- update upstream patches to 135 
+
 -------------------------------------------------------------------
 Fri Aug 31 12:37:39 CEST 2007 - mkoenig@suse.de

--- a/vim.spec
+++ b/vim.spec
@ -12,16 +12,16 @@

 Name:           vim
 Version:        7.1
-Release:        36
+Release:        45
 #
-License:        Other uncritical OpenSource License, http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
+License:        Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel python-devel ruby-devel tcl-devel update-alternatives update-desktop-files
 #
 %define pkg_version 7.1
-%define official_ptchlvl 243
+%define official_ptchlvl 135
 %define VIM_SUBDIR vim71
 #
 %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?jobs:-j%jobs}
@ -44,7 +44,7 @@ Provides:       vi_clone
 Recommends:     vim-data = %{version}
 %endif
 #
-URL:            http://www.vim.org/
+Url:            http://www.vim.org/
 Source:         ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
 Source1:        ftp://ftp.vim.org/pub/vim/extra/vim-%{pkg_version}-extra.tar.bz2
 Source2:        ftp://ftp.vim.org/pub/vim/extra/vim-%{pkg_version}-lang.tar.bz2
@ -66,7 +66,7 @@ Source17:       apparmor.vim
 Source18:       missing-vim-client
 Source19:       gvim.desktop
 Source99:       vim-7.1-rpmlintrc
-#Patch0:         %{name}-7.1-official_patches_001-%{official_ptchlvl}.bz2
+Patch0:         %{name}-upstream-patches-7.1-%{official_ptchlvl}.patch.bz2
 Patch1:         %{name}-7.0-no_nb.patch
 Patch3:         %{name}-7.0-filetype_ycp.patch
 Patch4:         %{name}-7.0-gvimrc_fontset.patch
@ -87,7 +87,6 @@ Patch19:        vim-7.1-diff_check.patch
 # tbd???        %name-6.3-ga-utf8.diff
 # tbd???        %name-6.3-initvals.diff
 # tbd???        vim64-svn-crash.patch
-Patch100:       ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.039
 Summary:        Vi IMproved

 %description
@ -264,7 +263,7 @@ Authors:

 %prep
 %setup -q -n %{VIM_SUBDIR} -b 1 -b 2
-#%patch
+%patch
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
@ -282,7 +281,6 @@ Authors:
 %patch17 -p1
 %patch18
 %patch19 -p1
-%patch100 -p0
 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} .
 rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
 rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
@ -326,14 +324,12 @@ export GUI_OPTIONS="\
    ${COMMON_OPTIONS} --disable-gui --without-x --disable-gpm \
    --disable-perlinterp --disable-pythoninterp \
    --disable-rubyinterp --disable-tclinterp
-
 %make
 %{__cp} src/vim vim-normal
 %{__make} distclean
 #
 # build enhanced binary
 %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} --disable-gui
-
 %make
 %{__cp} src/vim vim-enhanced
 %{__make} distclean
@ -341,7 +337,6 @@ export GUI_OPTIONS="\
 # build enhanced gvim binary
 %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} ${GUI_OPTIONS}
 %if 0%{?with_splitted_gvim}
-
 %make
 %{__cp} src/vim gvim-enhanced
 %{__make} distclean
@ -349,7 +344,6 @@ export GUI_OPTIONS="\
 # build gvim binary
 %configure ${COMMON_OPTIONS} ${GUI_OPTIONS}
 %endif
-
 %make
 #
 # build vitmp
@ -372,7 +366,10 @@ done
 %{__install} -D -m 0755 gvim-enhanced %{buildroot}%{_bindir}/gvim-enhanced
 %endif
 # compat symlinks
-%{__ln_s} -f %{_datadir}/vim/current/tools/missing-vim-client %{buildroot}/bin/vim
+# we need a dummy target for /etc/alternatives/vim
+mkdir -p %{buildroot}/etc/alternatives
+touch %{buildroot}/etc/alternatives/vim 
+%{__ln_s} -f /etc/alternatives/vim %{buildroot}/bin/vim
 %{__ln_s} -f /bin/vim   %{buildroot}/bin/vi
 %{__ln_s} -f /bin/vim   %{buildroot}%{_bindir}/vim
 %{__ln_s} -f /bin/vim   %{buildroot}%{_bindir}/vi
@ -422,7 +419,6 @@ rm -rf %{buildroot}%{_mandir}/it.UTF-8/
 # and move russian manpages to a place where they can be found
 mv %{buildroot}%{_mandir}/ru.UTF-8 %{buildroot}%{_mandir}/ru
 #
-
 %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang

 %clean
@ -489,6 +485,7 @@ fi
 %files base
 %defattr(-,root,root,-)
 %config(noreplace) /etc/vimrc
+%ghost /etc/alternatives/vim
 # symlinks
 /bin/vi
 /bin/vim
@ -635,8 +632,11 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/gvim-enhanced
 %endif
-
 %changelog
+* Thu Oct 04 2007 - mkoenig@suse.de
+- fix alternatives problem which resulted from linking to the
+  dummy script in install process [#305790]
+- update upstream patches to 135
 * Fri Aug 31 2007 - mkoenig@suse.de
 - let vim detect a failing diff [#252901]
 - add /bin/ex symlink [#306423]