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

vim.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vim (Version 7.2)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -20,7 +20,7 @@
 
 Name:           vim
 Version:        7.2
-Release:        7
+Release:        9
 #
 License:        Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
@@ -29,7 +29,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel perl python-devel ruby-devel tcl-devel update-alternatives update-desktop-files
 #
 %define pkg_version 7.2
-%define official_ptchlvl 022
+%define official_ptchlvl 108
 %define VIM_SUBDIR vim72
 %define site_runtimepath /usr/share/vim/site
 #
@@ -72,8 +72,10 @@ Source15:       vim132
 Source16:       gvim.png
 Source18:       missing-vim-client
 Source19:       gvim.desktop
+Source20:       spec.skeleton
+Source21:       dot.vimrc
+Source98:       %{name}-7.2-patches.bz2
 Source99:       vim-7.1-rpmlintrc
-Patch0:         %{name}-upstream-patches-7.2-%{official_ptchlvl}.bz2
 Patch1:         %{name}-7.0-no_nb.patch
 Patch4:         %{name}-7.0-gvimrc_fontset.patch
 Patch5:         %{name}-7.0-highlight_fstab.patch
@@ -88,7 +90,7 @@ Patch14:        %{name}-7.0-grub.patch
 Patch15:        vim-7.2-filetype_apparmor.patch
 Patch16:        %{name}-7.0-flex-array.diff
 Patch18:        vim-7.1-filetype_spec.patch
-Patch19:        vim-7.1-diff_check.patch
+Patch19:        vim-7.2-diff_check.patch
 Patch21:        vim-7.1-filetype_changes.patch
 Patch22:        vim-7.1-remove-terrible-hack.patch
 # tbd???        %name-6.3-ga-utf8.diff
@@ -118,7 +120,7 @@ Authors:
     Bram Moolenaar <bram@vim.org>
 
 %package data
-License:        Other uncritical OpenSource License
+License:        Other uncritical OpenSource License; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 PreReq:         %{vim_prereq}
 #
@@ -145,7 +147,7 @@ Authors:
     Bram Moolenaar <bram@vim.org>
 
 %package base
-License:        Other uncritical OpenSource License
+License:        Other uncritical OpenSource License; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
 Group:          Productivity/Editors/Vi
 PreReq:         %{vim_prereq}
 PreReq:         update-alternatives
@@ -247,7 +249,7 @@ Authors:
 %endif
 
 %package -n gvim
-License:        Other uncritical OpenSource License
+License:        Other uncritical OpenSource License; Charityware. If you wish please donate to Uganda
 Group:          Productivity/Editors/Vi
 PreReq:         %{gvim_prereq}
 PreReq:         update-alternatives
@@ -279,8 +281,14 @@ Authors:
     Bram Moolenaar <mool@oce.nl>
 
 %prep
-%setup -q -n %{VIM_SUBDIR} -b 1 -b 2
-%patch
+%setup -q -n %{VIM_SUBDIR} -b 1 -b 2 -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
 %patch1 -p1
 %patch4 -p1
 %patch5 -p1
@@ -417,6 +425,11 @@ mkdir -m 0755 %{buildroot}%{site_runtimepath}/plugin
 mkdir -m 0755 %{buildroot}%{site_runtimepath}/syntax
 mkdir -m 0755 %{buildroot}%{site_runtimepath}/ftdetect
 mkdir -m 0755 %{buildroot}%{site_runtimepath}/after/syntax
+mkdir -m 0755 %{buildroot}%{_datadir}/vim/current/skeletons
+mkdir -m 0755 %{buildroot}/etc/skel
+# install spec helper
+install -m 0644 %{S:20}  %{buildroot}%{_datadir}/vim/current/skeletons/skeleton.spec
+install -m 0644 %{S:21}  %{buildroot}/etc/skel/.vimrc
 # desktop file for gvim
 %suse_update_desktop_file -i gvim Utility TextEditor
 #
@@ -513,6 +526,7 @@ fi
 %files base
 %defattr(-,root,root,-)
 %config(noreplace) /etc/vimrc
+%config(noreplace) /etc/skel/.vimrc
 %ghost /etc/alternatives/vim
 # symlinks
 /bin/vi
@@ -566,6 +580,7 @@ fi
 %dir %{_datadir}/vim/%{VIM_SUBDIR}/syntax/
 %dir %{_datadir}/vim/%{VIM_SUBDIR}/tools/
 %dir %{_datadir}/vim/%{VIM_SUBDIR}/tutor/
+%dir %{_datadir}/vim/%{VIM_SUBDIR}/skeletons/
 %dir %{site_runtimepath}
 %dir %{site_runtimepath}/autoload/
 %dir %{site_runtimepath}/colors/
@@ -587,6 +602,7 @@ fi
 %{_datadir}/vim/%{VIM_SUBDIR}/optwin.vim
 %{_datadir}/vim/%{VIM_SUBDIR}/scripts.vim
 %{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/skeletons/skeleton.spec
 # stupid helper
 # THIS BREAKS THE BUILD: %{_datadir}/vim/current/tools/missing-vim-client
 %{_datadir}/vim/%{VIM_SUBDIR}/tools/missing-vim-client
@@ -672,6 +688,9 @@ fi
 %endif
 
 %changelog
+* Mon Feb 16 2009 werner@suse.de
+- Update to patchlevel 108 ... fixes bnc#470100, bnc#465255,
+  bnc#439148, bnc#436755, bnc#457098, and bnc#470100
 * Fri Nov 28 2008 mkoenig@suse.de
 - don't set timeout in default vimrc [bnc#449932]
 * Thu Oct 09 2008 mkoenig@suse.de