rpms/vim-vimoutliner/devel vim-vimoutliner.spec, NONE, 1.1 vimoutliner-Makefile, NONE, 1.1 vimoutliner-README.Fedora, NONE, 1.1 vimoutliner-mc-build.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matej Cepl (mcepl)
fedora-extras-commits at redhat.com
Tue Jan 9 09:05:07 UTC 2007
Author: mcepl
Update of /cvs/extras/rpms/vim-vimoutliner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25677/devel
Modified Files:
.cvsignore sources
Added Files:
vim-vimoutliner.spec vimoutliner-Makefile
vimoutliner-README.Fedora vimoutliner-mc-build.patch
Log Message:
auto-import vim-vimoutliner-0.3.4-8 on branch devel from vim-vimoutliner-0.3.4-8.src.rpm
--- NEW FILE vim-vimoutliner.spec ---
%define otl2html_version 1.40
Name: vim-vimoutliner
Version: 0.3.4
Release: 8%{?dist}
Summary: Script for building an outline editor on top of Vim
Group: Applications/Editors
License: GPL
URL: http://www.vimoutliner.org/
Source0: http://www.vimoutliner.org/files/vimoutliner-%{version}.tar.gz
# the following two tarballs are from http://www.vimoutliner.org as well, but
# they are in CMS without good URLs.
Source1: otl2html-%{otl2html_version}.tgz
Source2: otl_handler.tgz
# things which are in discussion about putting upstream
Source3: vimoutliner-local.tar.bz2
Source4: vimoutliner-README.Fedora
Source5: vimoutliner-Makefile
Patch: vimoutliner-mc-build.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: vim-enhanced perl python
Requires(post): vim-enhanced
Requires(postun): vim-enhanced
#Requires: libxml-writer-perl libpalm-perl
%description
Vimoutliner provides commands for building using the Vim text editor as an
outline editor. For more explanation on what outlines are and what they are
good for see the script's webpage at
http://www.vimoutliner.org and the general discussion of outlines on
http://www.troubleshooters.com/tpromag/199911/199911.htm.
%prep
%setup -q -n vimoutliner-%{version} -a 1 -a 2 -a 3
cp -f -p %{SOURCE4} README.Fedora
cp -f -p %{SOURCE5} Makefile
find . -name .\*.swp -delete
mv otl2html-* doc/otl2html
mv otl_handler doc/otl_handler
mv doc/otl2html/README README.otl2html
mv doc/otl_handler/README README.otl_handler
mv doc/vo_readme.txt .
find doc/ -type f -perm /111 -exec chmod -x '{}' \;
rm doc/otl2html/otl2html.py
%patch -p1 -b .MC-build
%build
mv doc examples
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_sysconfdir}
install -p -m a+r,u+w vimoutlinerrc \
$RPM_BUILD_ROOT%{_sysconfdir}/vimoutlinerrc
install -m a+rx,u+w -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
install -p -m a+r,u+w vimoutliner-mimefile.xml \
$RPM_BUILD_ROOT%{_datadir}/mime/packages/vimoutliner.xml
%clean
rm -rf $RPM_BUILD_ROOT
%post
umask 022
[ ! -x %{_bindir}/update-mime-database ] \
|| update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
cd %{_datadir}/vim/vimfiles/doc
vim -u NONE -esX -c "helptags ." -c quit
grep -q "filetype plugin on" /etc/vimrc \
|| echo -e "\nfiletype plugin on" >>/etc/vimrc
%postun
if [ $1 -eq 0 ]; then
umask 022
[ ! -x %{_bindir}/update-mime-database ] \
|| update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||:
cd %{_datadir}/vim/vimfiles/doc
vim -u NONE -esX -c "helptags ." -c quit
fi
%files
%defattr(-,root,root,-)
%doc README.otl2html README.otl_handler README.Fedora LICENSE
%doc examples
%config(noreplace) %{_sysconfdir}/vimoutlinerrc
%{_bindir}/otl2html
%{_bindir}/vo_maketags
%{_datadir}/vim/vimfiles/*/*
%{_datadir}/mime/packages/vimoutliner.xml
%{_mandir}/man1/*.1.gz
%changelog
* Mon Jan 8 2007 Matěj Cepl <mcepl at redhat.com> 0.3.4-8
- changed named to vim-vimoutliner to follow Fedora Naming
Guidelines.
* Mon Dec 11 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-7
- package should own only files in /usr/share/vim/vimfiles/*/
directories, not the directory itself. Unfortunately, it is bad
hack, because /usr/share/vim/vimfiles directory itself is not
owned by any package (see bug no. 219154).
- made comments about origin of additional Sources.
- cp gets additional -p
- calling of update-desktop-database removed
- removed helpztags
* Mon Dec 4 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-6
- other ugly Debianism: don't put additional files into diff,
when we could have another source file.
- again fixed problem with levels starting with non-ASCII
character
* Sat Dec 2 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-5
- No macros in changelog anymore.
- Also there are no any <TAB>s in this file.
- Package doesn't own directories in %%files when not required.
- Sources have URLs when possible.
* Tue Nov 28 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-4
- Created Makefile for installation (so we could offer it upstream).
- compression of manpages is done automagically by rpmbuild, no need
to do it ourselves.
* Sat Nov 11 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-3
- Finished Fedorization of originally README.Debian
- added otl2html and otl_handler to examples/ subdirectory of
%%doc.
- fixed manpages (don't install manpages for scripts we don't
carry).
* Wed Nov 8 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-2
- Fixed paths in ftplugin/vo_base.vim so that additional plugins
actually load when requested.
* Tue Nov 7 2006 Matěj Cepl <mcepl at redhat.com> 0.3.4-1
- Initial build.
--- NEW FILE vimoutliner-Makefile ---
DESTDIR=$HOME/.vimoutliner
all: build
install: install-noarch install-man
install-noarch:
install -m a+rx,u+w -d $(DESTDIR)/usr/share/vim/vimfiles/ftplugin
install -p -m a+r,u+w ftplugin/vo_*.vim \
$(DESTDIR)/usr/share/vim/vimfiles/ftplugin/
install -p -m a+r,u+w add-ons/plugins/vo_*.vim \
$(DESTDIR)/usr/share/vim/vimfiles/ftplugin/
install -m a+rx,u+w -d $(DESTDIR)/usr/share/vim/vimfiles/syntax
install -p -m a+r,u+w syntax/vo_*.vim \
$(DESTDIR)/usr/share/vim/vimfiles/syntax/
install -m a+rx,u+w -d $(DESTDIR)/usr/share/vim/vimfiles/ftdetect
install -p -m a+r,u+w ftdetect/vo_*.vim \
$(DESTDIR)/usr/share/vim/vimfiles/ftdetect/
install -m a+rx,u+w -d $(DESTDIR)/usr/share/vim/vimfiles/doc
install -p -m a+r,u+w vo_readme.txt \
$(DESTDIR)/usr/share/vim/vimfiles/doc
install -m a+rx,u+w -d $(DESTDIR)/usr/share/vim/vimfiles/colors
install -p -m a+r,u+w colors/vo_*.vim \
$(DESTDIR)/usr/share/vim/vimfiles/colors/
install -m a+rx,u+w -d $(DESTDIR)/usr/bin
install -p -m a+rx,u+w scripts/vo_maketags.pl \
$(DESTDIR)/usr/bin/vo_maketags
install -p -m a+rx,u+w add-ons/scripts/otl2html.py \
$(DESTDIR)/usr/bin/otl2html
install-man:
install -m a+rx,u+w -d $(DESTDIR)/usr/share/man/man1/
# don't install manpages for non-installed scripts
install -p -m a+r,u+w {otl2html,vo_maketags}.1 \
$(DESTDIR)/usr/share/man/man1/
build:
/bin/true
--- NEW FILE vimoutliner-README.Fedora ---
vimoutliner for Fedora
----------------------
1) Do not, I repeat, DO NOT follow installation instructions in
the upstream vo_readme.txt (which is installed as help :he
vo-install). It is not necessary (Fedora package should do all
installation itself) and locations of many files has been
changed to follow needs of one centralized installation. If
you want to know where everything is located, run
rpm -ql vimoutliner
2) Upstream documentation (installed as :he vo) mentions ,, as
the prefix to most VO commands. In reality, even the upstream
package actually uses the native Vim <localleader> variable,
which is set to \ (backslash) by default, so that a command
listed in the README file as ,,B -- "Make body text start with
a space", is actually executed when you type \B (with default
defintion of <localleader>).
If you want to use different localleader uncomment in
/etc/vimoutlinerrc the following line and change the value
of the variable to whatever you want.
"let maplocalleader = ",," " this is prepended to VO key
3) For information how to use vimoutliner, you can use vim help
under :he vimoutliner.
4) Two very useful plugins for VO -- hoist and checkbox -- ARE
enabled by default. Their status could be changed by changes
in the global variable g:vo_modules_load either in the VO
global configuration file /etc/vimoutlinerrc or in
personal configuration file ~/.vimoutlinerrc.
Matej
(additional information from the upstream vo_INSTALL.TXT file):
Feedback
Any feedback concerning these scripts or VimOutliner should be
sent to the project's email list (of course, all feedback
concerning bugs in packaging of this package should still go to
the Red Hat Bugzilla http://bugzilla.redhat.com component Fedora
Extras).
Participation
If you'd like to help with the development, testing and/or
documentation of VimOutliner, please join the mailing list. You
can do so here:
http://www.lists.vimoutliner.org/mailman/listinfo/vimoutliner
or by sending email to vimoutliner-request at vimoutliner.org with
word "subscribe" in Subject: line of the message.
Have fun!
Noel
" vim:set nobackup tw=65 fo=tcqn ai:
vimoutliner-mc-build.patch:
--- NEW FILE vimoutliner-mc-build.patch ---
--- vimoutliner-0.3.4/syntax/vo_base.vim.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/syntax/vo_base.vim 2006-12-04 13:27:20.000000000 +0100
@@ -219,7 +219,7 @@
syn match outlTags '_tag_\w*' contained
" Noel's style of body text {{{2
-syntax region BT1 start=+^ \S+ skip=+^ \S+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region BT1 start=+^ \S+ skip=+^ \S+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT2 start=+^\(\t\)\{1} \S+ skip=+^\(\t\)\{1} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT3 start=+^\(\t\)\{2} \S+ skip=+^\(\t\)\{2} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT4 start=+^\(\t\)\{3} \S+ skip=+^\(\t\)\{3} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -230,7 +230,7 @@
syntax region BT9 start=+^\(\t\)\{8} \S+ skip=+^\(\t\)\{8} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"comment-style bodytext as per Steve Litt {{{2
-syntax region BT1 start=+^:+ skip=+^:+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region BT1 start=+^:+ skip=+^:+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT2 start=+^\(\t\)\{1}:+ skip=+^\(\t\)\{1}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT3 start=+^\(\t\)\{2}:+ skip=+^\(\t\)\{2}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT4 start=+^\(\t\)\{3}:+ skip=+^\(\t\)\{3}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -241,7 +241,7 @@
syntax region BT9 start=+^\(\t\)\{8}:+ skip=+^\(\t\)\{8}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"Preformatted body text {{{2
-syntax region PT1 start=+^;+ skip=+^;+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region PT1 start=+^;+ skip=+^;+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region PT2 start=+^\(\t\)\{1};+ skip=+^\(\t\)\{1};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region PT3 start=+^\(\t\)\{2};+ skip=+^\(\t\)\{2};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region PT4 start=+^\(\t\)\{3};+ skip=+^\(\t\)\{3};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -252,7 +252,7 @@
syntax region PT9 start=+^\(\t\)\{8};+ skip=+^\(\t\)\{8};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"Preformatted tables {{{2
-syntax region TA1 start=+^|+ skip=+^|+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region TA1 start=+^|+ skip=+^|+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region TA2 start=+^\(\t\)\{1}|+ skip=+^\(\t\)\{1}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region TA3 start=+^\(\t\)\{2}|+ skip=+^\(\t\)\{2}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region TA4 start=+^\(\t\)\{3}|+ skip=+^\(\t\)\{3}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -263,7 +263,7 @@
syntax region TA9 start=+^\(\t\)\{8}|+ skip=+^\(\t\)\{8}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"wrapping user text {{{2
-syntax region UT1 start=+^>+ skip=+^>+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region UT1 start=+^>+ skip=+^>+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UT2 start=+^\(\t\)\{1}>+ skip=+^\(\t\)\{1}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UT3 start=+^\(\t\)\{2}>+ skip=+^\(\t\)\{2}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UT4 start=+^\(\t\)\{3}>+ skip=+^\(\t\)\{3}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -274,7 +274,7 @@
syntax region UT9 start=+^\(\t\)\{8}>+ skip=+^\(\t\)\{8}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"non-wrapping user text {{{2
-syntax region UB1 start=+^<+ skip=+^<+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region UB1 start=+^<+ skip=+^<+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UB2 start=+^\(\t\)\{1}<+ skip=+^\(\t\)\{1}<+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UB3 start=+^\(\t\)\{2}<+ skip=+^\(\t\)\{2}<+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UB4 start=+^\(\t\)\{3}<+ skip=+^\(\t\)\{3}<+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -291,7 +291,7 @@
" Headings {{{2
syntax region OL1 start=+^[^:\t]+ end=+^[^:\t]+me=e-1 contains=outlTags,BT1,BT2,PT1,PT2,TA1,TA2,UT1,UT2,UB1,UB2,spellErr,SpellErrors,BadWord,OL2 keepend
-syntax region OL2 start=+^\t[^:\t]+ end=+^\t[^:\t]+me=e-2 contains=outlTags,BT2,BT3,PT2,PT3,TA2,TA3,UT2,UT3,UB2,UB3,spellErr,SpellErrors,BadWord,OL3 keepend
+syntax region OL2 start=+^\t[^:\t]+ end=+^\t[^:\t]+me=s-1 contains=outlTags,BT2,BT3,PT2,PT3,TA2,TA3,UT2,UT3,UB2,UB3,spellErr,SpellErrors,BadWord,OL3 keepend
syntax region OL3 start=+^\(\t\)\{2}[^:\t]+ end=+^\(\t\)\{2}[^:\t]+me=e-3 contains=outlTags,BT3,BT4,PT3,PT4,TA3,TA4,UT3,UT4,UB3,UB4,spellErr,SpellErrors,BadWord,OL4 keepend
syntax region OL4 start=+^\(\t\)\{3}[^:\t]+ end=+^\(\t\)\{3}[^:\t]+me=e-4 contains=outlTags,BT4,BT5,PT4,PT5,TA4,TA5,UT4,UT5,UB4,UB5,spellErr,SpellErrors,BadWord,OL5 keepend
syntax region OL5 start=+^\(\t\)\{4}[^:\t]+ end=+^\(\t\)\{4}[^:\t]+me=e-5 contains=outlTags,BT5,BT6,PT5,PT6,TA5,TA6,UT5,UT6,UB5,UB6,spellErr,SpellErrors,BadWord,OL6 keepend
--- vimoutliner-0.3.4/ftplugin/vo_base.vim.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/ftplugin/vo_base.vim 2006-12-04 11:06:07.000000000 +0100
@@ -656,7 +656,8 @@
let b:current_syntax = "outliner"
" Personal configuration options files as per Matej Cepl
-setlocal runtimepath+=$HOME/.vimoutliner,$HOME
+"orig setlocal runtimepath+=$HOME/.vimoutliner,$HOME,/etc
+setlocal runtimepath+=/etc,$HOME/.vimoutliner,$HOME
ru! .vimoutlinerrc vimoutlinerrc
" More sophisticated version of the modules loading; thanks to Preben 'Peppe'
" Guldberg for telling me how to split string and make semi-lists with vim.
@@ -668,8 +669,7 @@
let s:part = strpart(s:tmp, 0, s:idx)
let s:tmp = strpart(s:tmp, s:idx + 1)
let s:idx = stridx(s:tmp, ':')
- "exec 'ru! ftplugin/vo_' . part . '.vim'
- exec "runtime! plugins/vo_" . s:part . ".vim"
+ exec 'runtime! ftplugin/vo_' . s:part . '.vim'
endwhile
" The End
--- vimoutliner-0.3.4/vo_readme.txt.MC-build 2006-12-04 11:06:51.000000000 +0100
+++ vimoutliner-0.3.4/vo_readme.txt 2006-12-04 11:26:33.000000000 +0100
@@ -246,12 +246,12 @@
Ctrl+K is a VimOutliner synonym for Ctrl+]
Ctrl+N is a VimOutliner synonym for Ctrl+T
- Debian Installation *vo-debian*
+ Installation from distribution packages
+ *vo-packages* *vo-debian*
- Debian does include Vim Outliner as a package. However some
- Debian version require this line to be added to your .vimrc file:
-
- syntax on
+ Debian and Fedora/Extras include Vim Outliner as a package. It is
+ usually preferable to use official package custom-tailored for your
+ distribution than to install VimOutliner from generic tarball.
-------------------------------------------------------------------------
USING VIMOUTLINER ON OTHER FILE TYPES *vo-other-files*
--- vimoutliner-0.3.4/ftdetect/vo_base.vim.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/ftdetect/vo_base.vim 2006-12-04 11:06:07.000000000 +0100
@@ -74,9 +74,6 @@
"Revision 1.1 2003/02/08 21:11:26 noel
"Initial revision
"
-if exists("did_load_filetypes")
- finish
-endif
augroup filetypedetect
au! BufRead,BufNewFile *.otl setfiletype vo_base
au! BufRead,BufNewFile *.oln setfiletype xoutliner
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vim-vimoutliner/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Jan 2007 09:03:30 -0000 1.1
+++ .cvsignore 9 Jan 2007 09:04:37 -0000 1.2
@@ -0,0 +1,4 @@
+otl2html-1.40.tgz
+otl_handler.tgz
+vimoutliner-0.3.4.tar.gz
+vimoutliner-local.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vim-vimoutliner/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Jan 2007 09:03:30 -0000 1.1
+++ sources 9 Jan 2007 09:04:37 -0000 1.2
@@ -0,0 +1,4 @@
+4ce81f4db48e47ecf183fbbe85ef36c9 otl2html-1.40.tgz
+ca8393386032866d9f2b8a0d74d6c6fc otl_handler.tgz
+66b69714be50a1f411830380a3e6bd5e vimoutliner-0.3.4.tar.gz
+1a6361c27f295404a057af93bf6fc23c vimoutliner-local.tar.bz2
More information about the scm-commits
mailing list