This commit is contained in:
parent
5df3b41c08
commit
05f37a24f6
29
dot.vimrc
Normal file
29
dot.vimrc
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
" ~/.vimrc (configuration file for vim only)
|
||||||
|
" skeletons
|
||||||
|
function! SKEL_spec()
|
||||||
|
0r /usr/share/vim/current/skeletons/skeleton.spec
|
||||||
|
language time en_US
|
||||||
|
let login = system('whoami')
|
||||||
|
if v:shell_error
|
||||||
|
let login = 'unknown'
|
||||||
|
else
|
||||||
|
let newline = stridx(login, "\n")
|
||||||
|
if newline != -1
|
||||||
|
let login = strpart(login, 0, newline)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
let hostname = system('hostname -f')
|
||||||
|
if v:shell_error
|
||||||
|
let hostname = 'localhost'
|
||||||
|
else
|
||||||
|
let newline = stridx(hostname, "\n")
|
||||||
|
if newline != -1
|
||||||
|
let hostname = strpart(hostname, 0, newline)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
exe "%s/specRPM_CREATION_DATE/" . strftime("%a\ %b\ %d\ %Y") . "/ge"
|
||||||
|
exe "%s/specRPM_CREATION_AUTHOR_MAIL/" . login . "@" . hostname . "/ge"
|
||||||
|
exe "%s/specRPM_CREATION_NAME/" . expand("%:t:r") . "/ge"
|
||||||
|
endfunction
|
||||||
|
autocmd BufNewFile *.spec call SKEL_spec()
|
||||||
|
" ~/.vimrc ends here
|
49
spec.skeleton
Normal file
49
spec.skeleton
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
#
|
||||||
|
# This file and all modifications and additions to the pristine
|
||||||
|
# package are under the same license as the package itself.
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
Name: specRPM_CREATION_NAME
|
||||||
|
Version:
|
||||||
|
Release:
|
||||||
|
Summary:
|
||||||
|
Group:
|
||||||
|
License:
|
||||||
|
Url:
|
||||||
|
PreReq:
|
||||||
|
Provides:
|
||||||
|
BuildRequires:
|
||||||
|
Source:
|
||||||
|
Patch:
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
AutoReqProv: on
|
||||||
|
|
||||||
|
%description
|
||||||
|
|
||||||
|
Authors:
|
||||||
|
--------
|
||||||
|
Name Surname
|
||||||
|
%prep
|
||||||
|
%setup
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
|
||||||
|
%install
|
||||||
|
%makeinstall
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%post
|
||||||
|
%postun
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,0755)
|
||||||
|
%doc ChangeLog README COPYING
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* specRPM_CREATION_DATE - specRPM_CREATION_AUTHOR_MAIL
|
@ -210,7 +210,7 @@ endif " has("autocmd")
|
|||||||
|
|
||||||
" Changed default required by SuSE security team--be aware if enabling this
|
" Changed default required by SuSE security team--be aware if enabling this
|
||||||
" that it potentially can open for malicious users to do harmful things.
|
" that it potentially can open for malicious users to do harmful things.
|
||||||
set modelines=0
|
set nomodeline
|
||||||
|
|
||||||
" get easier to use and more user friendly vim defaults
|
" get easier to use and more user friendly vim defaults
|
||||||
" /etc/vimrc ends here
|
" /etc/vimrc ends here
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
Index: vim71/src/diff.c
|
--- vim72/src/diff.c
|
||||||
===================================================================
|
+++ vim72/src/diff.c 2009-02-16 17:11:33.224201744 +0100
|
||||||
--- vim71.orig/src/diff.c
|
|
||||||
+++ vim71/src/diff.c
|
|
||||||
@@ -42,7 +42,7 @@ static void diff_check_unchanged __ARGS(
|
@@ -42,7 +42,7 @@ static void diff_check_unchanged __ARGS(
|
||||||
static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
|
static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
|
||||||
static void diff_redraw __ARGS((int dofold));
|
static void diff_redraw __ARGS((int dofold));
|
||||||
@ -11,24 +9,24 @@ Index: vim71/src/diff.c
|
|||||||
static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
|
static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
|
||||||
static int diff_cmp __ARGS((char_u *s1, char_u *s2));
|
static int diff_cmp __ARGS((char_u *s1, char_u *s2));
|
||||||
#ifdef FEAT_FOLDING
|
#ifdef FEAT_FOLDING
|
||||||
@@ -661,6 +661,7 @@ ex_diffupdate(eap)
|
@@ -665,6 +665,7 @@ ex_diffupdate(eap)
|
||||||
char_u *tmp_diff;
|
char_u *tmp_diff;
|
||||||
FILE *fd;
|
FILE *fd;
|
||||||
int ok;
|
int ok;
|
||||||
+ int retval;
|
+ int retval = 0;
|
||||||
|
int io_error = FALSE;
|
||||||
|
|
||||||
/* Delete all diffblocks. */
|
/* Delete all diffblocks. */
|
||||||
diff_clear(curtab);
|
@@ -717,7 +718,7 @@ ex_diffupdate(eap)
|
||||||
@@ -706,7 +707,7 @@ ex_diffupdate(eap)
|
if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
|
||||||
{
|
io_error = TRUE;
|
||||||
fwrite("line2\n", (size_t)6, (size_t)1, fd);
|
|
||||||
fclose(fd);
|
fclose(fd);
|
||||||
- diff_file(tmp_orig, tmp_new, tmp_diff);
|
- diff_file(tmp_orig, tmp_new, tmp_diff);
|
||||||
+ retval = diff_file(tmp_orig, tmp_new, tmp_diff);
|
+ retval = diff_file(tmp_orig, tmp_new, tmp_diff);
|
||||||
fd = mch_fopen((char *)tmp_diff, "r");
|
fd = mch_fopen((char *)tmp_diff, "r");
|
||||||
if (fd != NULL)
|
if (fd == NULL)
|
||||||
{
|
io_error = TRUE;
|
||||||
@@ -750,6 +751,12 @@ ex_diffupdate(eap)
|
@@ -763,6 +764,12 @@ ex_diffupdate(eap)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -41,7 +39,7 @@ Index: vim71/src/diff.c
|
|||||||
/* If we checked if "-a" works already, break here. */
|
/* If we checked if "-a" works already, break here. */
|
||||||
if (diff_a_works != MAYBE)
|
if (diff_a_works != MAYBE)
|
||||||
break;
|
break;
|
||||||
@@ -782,10 +789,13 @@ ex_diffupdate(eap)
|
@@ -797,10 +804,13 @@ ex_diffupdate(eap)
|
||||||
continue;
|
continue;
|
||||||
if (diff_write(buf, tmp_new) == FAIL)
|
if (diff_write(buf, tmp_new) == FAIL)
|
||||||
continue;
|
continue;
|
||||||
@ -59,7 +57,7 @@ Index: vim71/src/diff.c
|
|||||||
mch_remove(tmp_diff);
|
mch_remove(tmp_diff);
|
||||||
mch_remove(tmp_new);
|
mch_remove(tmp_new);
|
||||||
}
|
}
|
||||||
@@ -802,13 +812,14 @@ theend:
|
@@ -820,13 +830,14 @@ theend:
|
||||||
/*
|
/*
|
||||||
* Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
|
* Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
|
||||||
*/
|
*/
|
||||||
@ -75,7 +73,7 @@ Index: vim71/src/diff.c
|
|||||||
|
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
if (*p_dex != NUL)
|
if (*p_dex != NUL)
|
||||||
@@ -842,13 +853,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
|
@@ -860,13 +871,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
|
||||||
#ifdef FEAT_AUTOCMD
|
#ifdef FEAT_AUTOCMD
|
||||||
block_autocmds(); /* Avoid ShellCmdPost stuff */
|
block_autocmds(); /* Avoid ShellCmdPost stuff */
|
||||||
#endif
|
#endif
|
@ -1,7 +1,10 @@
|
|||||||
Index: vim72/runtime/filetype.vim
|
---
|
||||||
===================================================================
|
runtime/filetype.vim | 4
|
||||||
--- vim72.orig/runtime/filetype.vim 2008-10-09 11:29:24.000000000 +0200
|
runtime/syntax/apparmor.vim | 219 ++++++++++++++++++++++++++++++++++++++++++++
|
||||||
+++ vim72/runtime/filetype.vim 2008-10-09 11:29:45.000000000 +0200
|
2 files changed, 223 insertions(+)
|
||||||
|
|
||||||
|
--- vim72/runtime/filetype.vim
|
||||||
|
+++ vim72/runtime/filetype.vim
|
||||||
@@ -113,6 +113,10 @@ au BufNewFile,BufRead proftpd.conf* cal
|
@@ -113,6 +113,10 @@ au BufNewFile,BufRead proftpd.conf* cal
|
||||||
au BufNewFile,BufRead .htaccess setf apache
|
au BufNewFile,BufRead .htaccess setf apache
|
||||||
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
|
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
|
||||||
@ -13,37 +16,35 @@ Index: vim72/runtime/filetype.vim
|
|||||||
" XA65 MOS6510 cross assembler
|
" XA65 MOS6510 cross assembler
|
||||||
au BufNewFile,BufRead *.a65 setf a65
|
au BufNewFile,BufRead *.a65 setf a65
|
||||||
|
|
||||||
Index: vim72/runtime/syntax/apparmor.vim
|
--- vim72/runtime/syntax/apparmor.vim
|
||||||
===================================================================
|
+++ vim72/runtime/syntax/apparmor.vim
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ vim72/runtime/syntax/apparmor.vim 2008-10-09 11:33:16.000000000 +0200
|
|
||||||
@@ -0,0 +1,219 @@
|
@@ -0,0 +1,219 @@
|
||||||
+" $Id: apparmor.vim.in,v 1.6 2008/09/25 00:13:43 cb Exp $
|
+" $Id: apparmor.vim.in,v 1.6 2008/09/25 00:13:43 cb Exp $
|
||||||
+"
|
+"
|
||||||
+" ----------------------------------------------------------------------
|
+" ----------------------------------------------------------------------
|
||||||
+" Copyright (c) 2005 Novell, Inc. All Rights Reserved.
|
+" Copyright (c) 2005 Novell, Inc. All Rights Reserved.
|
||||||
+" Copyright (c) 2006-2008 Christian Boltz. All Rights Reserved.
|
+" Copyright (c) 2006-2008 Christian Boltz. All Rights Reserved.
|
||||||
+"
|
+"
|
||||||
+" This program is free software; you can redistribute it and/or
|
+" This program is free software; you can redistribute it and/or
|
||||||
+" modify it under the terms of version 2 of the GNU General Public
|
+" modify it under the terms of version 2 of the GNU General Public
|
||||||
+" License as published by the Free Software Foundation.
|
+" License as published by the Free Software Foundation.
|
||||||
+"
|
+"
|
||||||
+" This program is distributed in the hope that it will be useful,
|
+" This program is distributed in the hope that it will be useful,
|
||||||
+" but WITHOUT ANY WARRANTY; without even the implied warranty of
|
+" but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
+" GNU General Public License for more details.
|
+" GNU General Public License for more details.
|
||||||
+"
|
+"
|
||||||
+" You should have received a copy of the GNU General Public License
|
+" You should have received a copy of the GNU General Public License
|
||||||
+" along with this program; if not, contact Novell, Inc.
|
+" along with this program; if not, contact Novell, Inc.
|
||||||
+"
|
+"
|
||||||
+" To contact Novell about this file by physical or electronic mail,
|
+" To contact Novell about this file by physical or electronic mail,
|
||||||
+" you may find current contact information at www.novell.com.
|
+" you may find current contact information at rudin.suse.de:8891.
|
||||||
+"
|
+"
|
||||||
+" To contact Christian Boltz about this file by physical or electronic
|
+" To contact Christian Boltz about this file by physical or electronic
|
||||||
+" mail, you may find current contact information at www.cboltz.de/en/kontakt.
|
+" mail, you may find current contact information at www.cboltz.de/en/kontakt.
|
||||||
+" ----------------------------------------------------------------------
|
+" ----------------------------------------------------------------------
|
||||||
+"
|
+"
|
||||||
+" stick this file into ~/.vim/syntax/ and add these commands into your .vimrc
|
+" stick this file into ~/.vim/syntax/ and add these commands into your .vimrc
|
||||||
+" to have vim automagically use this syntax file for these directories:
|
+" to have vim automagically use this syntax file for these directories:
|
||||||
+"
|
+"
|
||||||
+" autocmd BufNewFile,BufRead /etc/apparmor.d/* set syntax=apparmor
|
+" autocmd BufNewFile,BufRead /etc/apparmor.d/* set syntax=apparmor
|
||||||
@ -87,7 +88,7 @@ Index: vim72/runtime/syntax/apparmor.vim
|
|||||||
+ hi def link sdEntryK Normal
|
+ hi def link sdEntryK Normal
|
||||||
+ hi def link sdFlags Normal
|
+ hi def link sdFlags Normal
|
||||||
+ hi sdEntryChangeProfile ctermfg=darkgreen cterm=underline
|
+ hi sdEntryChangeProfile ctermfg=darkgreen cterm=underline
|
||||||
+"else
|
+"else
|
||||||
+" dark background
|
+" dark background
|
||||||
+" hi sdProfileName ctermfg=white
|
+" hi sdProfileName ctermfg=white
|
||||||
+" hi sdHatName ctermfg=white
|
+" hi sdHatName ctermfg=white
|
||||||
@ -143,14 +144,14 @@ Index: vim72/runtime/syntax/apparmor.vim
|
|||||||
+" Capability line
|
+" Capability line
|
||||||
+
|
+
|
||||||
+" normal capabilities - really keep this list? syn match sdCap should be enough... (difference: sdCapKey words would loose underlining)
|
+" normal capabilities - really keep this list? syn match sdCap should be enough... (difference: sdCapKey words would loose underlining)
|
||||||
+syn keyword sdCapKey chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_serv»ice net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_boot sys_nice sys_resou»rce sys_time sys_tty_config mknod lease
|
+syn keyword sdCapKey chown dac_override dac_read_search fowner fsetid kill setgid setuid setpcap linux_immutable net_bind_service net_broadcast net_admin net_raw ipc_lock ipc_owner sys_module sys_rawio sys_chroot sys_ptrace sys_pacct sys_boot sys_nice sys_resource sys_time sys_tty_config mknod lease audit_control
|
||||||
+
|
+
|
||||||
+" dangerous capabilities - highlighted separately
|
+" dangerous capabilities - highlighted separately
|
||||||
+syn keyword sdCapDanger sys_admin
|
+syn keyword sdCapDanger sys_admin
|
||||||
+
|
+
|
||||||
+" full line. Keywords are from sdCapKey + sdCapDanger
|
+" full line. Keywords are from sdCapKey + sdCapDanger
|
||||||
+syn match sdCap /\v^\s*capability\s+(chown|dac_override|dac_read_search|fowner|fsetid|kill|setgid|setuid|setpcap|linux_immutable|net_bind_serv»ice|net_broadcast|net_admin|net_raw|ipc_lock|ipc_owner|sys_module|sys_rawio|sys_chroot|sys_ptrace|sys_pacct|sys_boot|sys_nice|sys_resou»rce|sys_time|sys_tty_config|mknod|lease|sys_admin)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
|
+syn match sdCap /\v^\s*capability\s+(chown|dac_override|dac_read_search|fowner|fsetid|kill|setgid|setuid|setpcap|linux_immutable|net_bind_service|net_broadcast|net_admin|net_raw|ipc_lock|ipc_owner|sys_module|sys_rawio|sys_chroot|sys_ptrace|sys_pacct|sys_boot|sys_nice|sys_resource|sys_time|sys_tty_config|mknod|lease|sys_admin|audit_control)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
|
||||||
+syn match sdSetCap /\v^\s*set\s+capability\s+(chown|dac_override|dac_read_search|fowner|fsetid|kill|setgid|setuid|setpcap|linux_immutable|net_bind_serv»ice|net_broadcast|net_admin|net_raw|ipc_lock|ipc_owner|sys_module|sys_rawio|sys_chroot|sys_ptrace|sys_pacct|sys_boot|sys_nice|sys_resou»rce|sys_time|sys_tty_config|mknod|lease|sys_admin)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
|
+syn match sdSetCap /\v^\s*set\s+capability\s+(chown|dac_override|dac_read_search|fowner|fsetid|kill|setgid|setuid|setpcap|linux_immutable|net_bind_service|net_broadcast|net_admin|net_raw|ipc_lock|ipc_owner|sys_module|sys_rawio|sys_chroot|sys_ptrace|sys_pacct|sys_boot|sys_nice|sys_resource|sys_time|sys_tty_config|mknod|lease|sys_admin|audit_control)\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdCapKey,sdCapDanger,sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+" Network line
|
+" Network line
|
||||||
@ -220,11 +221,11 @@ Index: vim72/runtime/syntax/apparmor.vim
|
|||||||
+
|
+
|
||||||
+
|
+
|
||||||
+syn match sdProfileName /\v^((profile\s+)?\/\S+|profile\s+\S+)\s+(flags\=\((complain|audit)\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags,sdComment
|
+syn match sdProfileName /\v^((profile\s+)?\/\S+|profile\s+\S+)\s+(flags\=\((complain|audit)\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags,sdComment
|
||||||
+syn match sdProfileStart /{/ contained
|
+syn match sdProfileStart /{/ contained
|
||||||
+syn match sdProfileEnd /^}\s*(#.*)?$/ contained " TODO: syn region does not (yet?) allow usage of comment in end=
|
+syn match sdProfileEnd /^}\s*(#.*)?$/ contained " TODO: syn region does not (yet?) allow usage of comment in end=
|
||||||
+ " TODO: Removing the $ mark from end= will allow non-comments also :-(
|
+ " TODO: Removing the $ mark from end= will allow non-comments also :-(
|
||||||
+syn match sdHatName /\v^\s+(\^|profile\s+)\S+\s+(flags\=\((complain|audit)\)\s+)=\{/ contains=sdProfileStart,sdFlags,sdComment
|
+syn match sdHatName /\v^\s+(\^|profile\s+)\S+\s+(flags\=\((complain|audit)\)\s+)=\{/ contains=sdProfileStart,sdFlags,sdComment
|
||||||
+syn match sdHatStart /{/ contained
|
+syn match sdHatStart /{/ contained
|
||||||
+syn match sdHatEnd /}/ contained " TODO: allow comments + [same as for syn match sdProfileEnd]
|
+syn match sdHatEnd /}/ contained " TODO: allow comments + [same as for syn match sdProfileEnd]
|
||||||
+syn match sdFlags /\vflags\=\((complain|audit)\)/ contained contains=sdFlagKey
|
+syn match sdFlags /\vflags\=\((complain|audit)\)/ contained contains=sdFlagKey
|
||||||
+
|
+
|
||||||
|
3
vim-7.2-patches.bz2
Normal file
3
vim-7.2-patches.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:12ac83f555808b9b80c8b62ba41f52f4423b605de76c852996c997078349e721
|
||||||
|
size 97528
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:56b016dbd1216b8bc2c3cf962f34532c527d386fba3ef0332425e34e0ff83c81
|
|
||||||
size 19293
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 16 17:15:16 CET 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 14:50:42 CET 2008 - mkoenig@suse.de
|
Fri Nov 28 14:50:42 CET 2008 - mkoenig@suse.de
|
||||||
|
|
||||||
|
39
vim.spec
39
vim.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package vim (Version 7.2)
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
Name: vim
|
Name: vim
|
||||||
Version: 7.2
|
Version: 7.2
|
||||||
Release: 7
|
Release: 9
|
||||||
#
|
#
|
||||||
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
|
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
|
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 pkg_version 7.2
|
||||||
%define official_ptchlvl 022
|
%define official_ptchlvl 108
|
||||||
%define VIM_SUBDIR vim72
|
%define VIM_SUBDIR vim72
|
||||||
%define site_runtimepath /usr/share/vim/site
|
%define site_runtimepath /usr/share/vim/site
|
||||||
#
|
#
|
||||||
@ -72,8 +72,10 @@ Source15: vim132
|
|||||||
Source16: gvim.png
|
Source16: gvim.png
|
||||||
Source18: missing-vim-client
|
Source18: missing-vim-client
|
||||||
Source19: gvim.desktop
|
Source19: gvim.desktop
|
||||||
|
Source20: spec.skeleton
|
||||||
|
Source21: dot.vimrc
|
||||||
|
Source98: %{name}-7.2-patches.bz2
|
||||||
Source99: vim-7.1-rpmlintrc
|
Source99: vim-7.1-rpmlintrc
|
||||||
Patch0: %{name}-upstream-patches-7.2-%{official_ptchlvl}.bz2
|
|
||||||
Patch1: %{name}-7.0-no_nb.patch
|
Patch1: %{name}-7.0-no_nb.patch
|
||||||
Patch4: %{name}-7.0-gvimrc_fontset.patch
|
Patch4: %{name}-7.0-gvimrc_fontset.patch
|
||||||
Patch5: %{name}-7.0-highlight_fstab.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
|
Patch15: vim-7.2-filetype_apparmor.patch
|
||||||
Patch16: %{name}-7.0-flex-array.diff
|
Patch16: %{name}-7.0-flex-array.diff
|
||||||
Patch18: vim-7.1-filetype_spec.patch
|
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
|
Patch21: vim-7.1-filetype_changes.patch
|
||||||
Patch22: vim-7.1-remove-terrible-hack.patch
|
Patch22: vim-7.1-remove-terrible-hack.patch
|
||||||
# tbd??? %name-6.3-ga-utf8.diff
|
# tbd??? %name-6.3-ga-utf8.diff
|
||||||
@ -118,7 +120,7 @@ Authors:
|
|||||||
Bram Moolenaar <bram@vim.org>
|
Bram Moolenaar <bram@vim.org>
|
||||||
|
|
||||||
%package data
|
%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
|
Group: Productivity/Editors/Vi
|
||||||
PreReq: %{vim_prereq}
|
PreReq: %{vim_prereq}
|
||||||
#
|
#
|
||||||
@ -145,7 +147,7 @@ Authors:
|
|||||||
Bram Moolenaar <bram@vim.org>
|
Bram Moolenaar <bram@vim.org>
|
||||||
|
|
||||||
%package base
|
%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
|
Group: Productivity/Editors/Vi
|
||||||
PreReq: %{vim_prereq}
|
PreReq: %{vim_prereq}
|
||||||
PreReq: update-alternatives
|
PreReq: update-alternatives
|
||||||
@ -247,7 +249,7 @@ Authors:
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%package -n gvim
|
%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
|
Group: Productivity/Editors/Vi
|
||||||
PreReq: %{gvim_prereq}
|
PreReq: %{gvim_prereq}
|
||||||
PreReq: update-alternatives
|
PreReq: update-alternatives
|
||||||
@ -279,8 +281,14 @@ Authors:
|
|||||||
Bram Moolenaar <mool@oce.nl>
|
Bram Moolenaar <mool@oce.nl>
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{VIM_SUBDIR} -b 1 -b 2
|
%setup -q -n %{VIM_SUBDIR} -b 1 -b 2 -b 98
|
||||||
%patch
|
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
|
%patch1 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -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}/syntax
|
||||||
mkdir -m 0755 %{buildroot}%{site_runtimepath}/ftdetect
|
mkdir -m 0755 %{buildroot}%{site_runtimepath}/ftdetect
|
||||||
mkdir -m 0755 %{buildroot}%{site_runtimepath}/after/syntax
|
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
|
# desktop file for gvim
|
||||||
%suse_update_desktop_file -i gvim Utility TextEditor
|
%suse_update_desktop_file -i gvim Utility TextEditor
|
||||||
#
|
#
|
||||||
@ -513,6 +526,7 @@ fi
|
|||||||
%files base
|
%files base
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%config(noreplace) /etc/vimrc
|
%config(noreplace) /etc/vimrc
|
||||||
|
%config(noreplace) /etc/skel/.vimrc
|
||||||
%ghost /etc/alternatives/vim
|
%ghost /etc/alternatives/vim
|
||||||
# symlinks
|
# symlinks
|
||||||
/bin/vi
|
/bin/vi
|
||||||
@ -566,6 +580,7 @@ fi
|
|||||||
%dir %{_datadir}/vim/%{VIM_SUBDIR}/syntax/
|
%dir %{_datadir}/vim/%{VIM_SUBDIR}/syntax/
|
||||||
%dir %{_datadir}/vim/%{VIM_SUBDIR}/tools/
|
%dir %{_datadir}/vim/%{VIM_SUBDIR}/tools/
|
||||||
%dir %{_datadir}/vim/%{VIM_SUBDIR}/tutor/
|
%dir %{_datadir}/vim/%{VIM_SUBDIR}/tutor/
|
||||||
|
%dir %{_datadir}/vim/%{VIM_SUBDIR}/skeletons/
|
||||||
%dir %{site_runtimepath}
|
%dir %{site_runtimepath}
|
||||||
%dir %{site_runtimepath}/autoload/
|
%dir %{site_runtimepath}/autoload/
|
||||||
%dir %{site_runtimepath}/colors/
|
%dir %{site_runtimepath}/colors/
|
||||||
@ -587,6 +602,7 @@ fi
|
|||||||
%{_datadir}/vim/%{VIM_SUBDIR}/optwin.vim
|
%{_datadir}/vim/%{VIM_SUBDIR}/optwin.vim
|
||||||
%{_datadir}/vim/%{VIM_SUBDIR}/scripts.vim
|
%{_datadir}/vim/%{VIM_SUBDIR}/scripts.vim
|
||||||
%{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim
|
%{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim
|
||||||
|
%{_datadir}/vim/%{VIM_SUBDIR}/skeletons/skeleton.spec
|
||||||
# stupid helper
|
# stupid helper
|
||||||
# THIS BREAKS THE BUILD: %{_datadir}/vim/current/tools/missing-vim-client
|
# THIS BREAKS THE BUILD: %{_datadir}/vim/current/tools/missing-vim-client
|
||||||
%{_datadir}/vim/%{VIM_SUBDIR}/tools/missing-vim-client
|
%{_datadir}/vim/%{VIM_SUBDIR}/tools/missing-vim-client
|
||||||
@ -672,6 +688,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Nov 28 2008 mkoenig@suse.de
|
||||||
- don't set timeout in default vimrc [bnc#449932]
|
- don't set timeout in default vimrc [bnc#449932]
|
||||||
* Thu Oct 09 2008 mkoenig@suse.de
|
* Thu Oct 09 2008 mkoenig@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user