rpms/vim/devel vim-6.3-cvim.patch,NONE,1.1 vim.spec,1.79,1.80

Thu Sep 8 10:12:57 UTC 2005

Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15631

Modified Files:
	vim.spec 
Added Files:
	vim-6.3-cvim.patch 
Log Message:
 - fix path to csupport templates
 - point user at README.csupport so that defaults can be set
 - make vim buildable without csupport with a variable


vim-6.3-cvim.patch:
 cvim/plugin/c.vim |    5 +++--
 runtime/doc/tags  |   38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

--- NEW FILE vim-6.3-cvim.patch ---
--- vim63/cvim/plugin/c.vim.rhdefaults	2005-09-08 09:37:42.000000000 +0000
+++ vim63/cvim/plugin/c.vim	2005-09-08 09:39:24.000000000 +0000
@@ -48,7 +48,8 @@
 	"
 else
 	"
-	let s:root_dir	  = $HOME.'/.vim/'
+"	let s:root_dir	  = $HOME.'/.vim/'
+	let s:root_dir	  = $VIMRUNTIME.'/'
   let s:escfilename = ' \%#[]'
 	"
 endif
@@ -64,7 +65,7 @@
 "
 "  Modul global variables (with default values) which can be overridden.
 "
-let s:C_AuthorName     = ""
+let s:C_AuthorName     = "read README.csupport to learn how to set defaults"
 let s:C_AuthorRef      = ""
 let s:C_Email          = ""
 let s:C_Company        = ""
--- vim63/runtime/doc/tags.rhdefaults	2005-09-08 09:45:25.000000000 +0000
+++ vim63/runtime/doc/tags	2005-09-08 09:45:45.000000000 +0000
@@ -4028,6 +4028,7 @@
 byte2line()	eval.txt	/*byte2line()*
 bzip2	pi_gzip.txt	/*bzip2*
 c	change.txt	/*c*
+c-support	csupport.txt	/*c-support*
 c-syntax	syntax.txt	/*c-syntax*
 c.vim	syntax.txt	/*c.vim*
 cW	change.txt	/*cW*
@@ -4272,6 +4273,41 @@
 csqf	if_cscop.txt	/*csqf*
 cst	if_cscop.txt	/*cst*
 csto	if_cscop.txt	/*csto*
+csupport	csupport.txt	/*csupport*
+csupport-comm	csupport.txt	/*csupport-comm*
+csupport-comm-1	csupport.txt	/*csupport-comm-1*
+csupport-comm-2	csupport.txt	/*csupport-comm-2*
+csupport-comm-3	csupport.txt	/*csupport-comm-3*
+csupport-comm-4	csupport.txt	/*csupport-comm-4*
+csupport-comm-5	csupport.txt	/*csupport-comm-5*
+csupport-comm-6	csupport.txt	/*csupport-comm-6*
+csupport-comm-7	csupport.txt	/*csupport-comm-7*
+csupport-custom	csupport.txt	/*csupport-custom*
+csupport-custom-1	csupport.txt	/*csupport-custom-1*
+csupport-custom-2	csupport.txt	/*csupport-custom-2*
+csupport-dictionary	csupport.txt	/*csupport-dictionary*
+csupport-hotkeys	csupport.txt	/*csupport-hotkeys*
+csupport-idioms	csupport.txt	/*csupport-idioms*
+csupport-proto	csupport.txt	/*csupport-proto*
+csupport-release-notes	csupport.txt	/*csupport-release-notes*
+csupport-run	csupport.txt	/*csupport-run*
+csupport-run-1	csupport.txt	/*csupport-run-1*
+csupport-run-2	csupport.txt	/*csupport-run-2*
+csupport-run-3	csupport.txt	/*csupport-run-3*
+csupport-run-4	csupport.txt	/*csupport-run-4*
+csupport-run-5	csupport.txt	/*csupport-run-5*
+csupport-run-6	csupport.txt	/*csupport-run-6*
+csupport-run-7	csupport.txt	/*csupport-run-7*
+csupport-run-8	csupport.txt	/*csupport-run-8*
+csupport-snippets	csupport.txt	/*csupport-snippets*
+csupport-stat	csupport.txt	/*csupport-stat*
+csupport-taglist	csupport.txt	/*csupport-taglist*
+csupport-tempfiles	csupport.txt	/*csupport-tempfiles*
+csupport-tempfiles-1	csupport.txt	/*csupport-tempfiles-1*
+csupport-tempfiles-2	csupport.txt	/*csupport-tempfiles-2*
+csupport-usage-gvim	csupport.txt	/*csupport-usage-gvim*
+csupport-windows	csupport.txt	/*csupport-windows*
+csupport.txt	csupport.txt	/*csupport.txt*
 csverb	if_cscop.txt	/*csverb*
 ctags	tagsrch.txt	/*ctags*
 ctags-gone	version6.txt	/*ctags-gone*
@@ -4356,6 +4392,7 @@
 diff-patchexpr	diff.txt	/*diff-patchexpr*
 diff.txt	diff.txt	/*diff.txt*
 digraph-arg	change.txt	/*digraph-arg*
+digraph-encoding	digraph.txt	/*digraph-encoding*
 digraph-table	digraph.txt	/*digraph-table*
 digraph.txt	digraph.txt	/*digraph.txt*
 digraphs	digraph.txt	/*digraphs*
@@ -4846,7 +4883,6 @@
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
-help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- vim.spec	6 Sep 2005 15:30:24 -0000	1.79
+++ vim.spec	8 Sep 2005 10:12:54 -0000	1.80
@@ -18,6 +18,8 @@
 %define withnetbeans 0
 %endif
 
+%define withcvim 1
+
 
 %define baseversion 6.3
 %define vimdir vim63
@@ -26,7 +28,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 4
+Release: 5
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -148,6 +150,7 @@
 Patch3005: vim-6.2-rh4.patch
 Patch3006: vim-6.2-rh5.patch
 Patch3007: vim-6.3-dnssyntax.patch
+Patch3008: vim-6.3-cvim.patch
 
 Patch3100: vim-selinux.patch
 
@@ -375,8 +378,11 @@
 %endif
 
 %build
+%if "%{withcvim}" == "1"
 mkdir cvim
-( cd cvim; unzip %{SOURCE12} )
+( cd cvim; unzip %{SOURCE12}; )
+patch -p1 < %{PATCH3008}
+%endif
 
 cd src
 autoconf
@@ -442,6 +448,7 @@
 mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim}
 cp -f %{SOURCE5} .
 
+%if "%{withcvim}" == "1"
 # cvim plugin stuff:
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/codesnippets-c
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/plugin/templates
@@ -456,8 +463,9 @@
    install -m644 cvim/rc/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/rc/
    install -m644 cvim/wordlists/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/wordlists/
    install -m644 cvim/ftplugin/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/ftplugin/
-   cp cvim/doc/* doc
+   cp cvim/doc/* runtime/doc
    cp cvim/README.csupport .
+%endif
 
 cd src
 %makeinstall BINDIR=/bin DESTDIR=$RPM_BUILD_ROOT
@@ -660,6 +668,11 @@
 %endif
 
 %changelog
+* Thu Sep 08 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-5
+- fix path to csupport templates
+- point user at README.csupport so that defaults can be set
+- make vim buildable without csupport with a variable
+
 * Thu Sep 01 2005 Karsten Hopp <karsten at redhat.de> 6.3.086-3
 - move X11 stuff to /usr/bin per request of xorg.x11 maintainer
   Matthias Saou (#167176)


