New upstream release.

2012-05-18 12:22:33 +02:00 · 2012-05-18 12:22:33 +02:00 · 60c8e63ff9
commit 60c8e63ff9
parent e46ba2146b
5 changed files with 48 additions and 84 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@ otl2html-1.40.tgz
 otl_handler.tgz
 vimoutliner-0.3.4.tar.gz
 vimoutliner-local.tar.bz2
+/vimoutliner-0.3.6.tgz
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-4ce81f4db48e47ecf183fbbe85ef36c9  otl2html-1.40.tgz
+1928092231296af34c00b1ff8eab7db0  vimoutliner-0.3.6.tgz
 ca8393386032866d9f2b8a0d74d6c6fc  otl_handler.tgz
-66b69714be50a1f411830380a3e6bd5e  vimoutliner-0.3.4.tar.gz
+4ce81f4db48e47ecf183fbbe85ef36c9  otl2html-1.40.tgz
 1a6361c27f295404a057af93bf6fc23c  vimoutliner-local.tar.bz2
--- a/vim-vimoutliner.spec
+++ b/vim-vimoutliner.spec
@ -1,14 +1,14 @@
 %define otl2html_version 1.40

 Name:           vim-vimoutliner
-Version:        0.3.4
-Release:        14%{?dist}
+Version:        0.3.6
+Release:        1%{?dist}
 Summary:        Script for building an outline editor on top of Vim
 Group:          Applications/Editors
 # LICENSE says v2, but the code all says v2+
 License:        GPLv2+
 URL:            http://www.vimoutliner.org/
-Source0:        http://www.vimoutliner.org/files/vimoutliner-%{version}.tar.gz
+Source0:        https://github.com/downloads/vimoutliner/vimoutliner/vimoutliner-%{version}.tgz
 # 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
@ -19,7 +19,6 @@ Source4:        vimoutliner-README.Fedora
 Source5:        vimoutliner-Makefile
 Patch:          vimoutliner-mc-build.patch
 BuildArch:      noarch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       vim-enhanced perl python
 Requires(post): vim-enhanced
 Requires(postun): vim-enhanced
@ -33,10 +32,11 @@ 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
+%setup -q -n vimoutliner -a 1 -a 2 -a 3
 cp -f -p  %{SOURCE4} README.Fedora
 cp -f -p  %{SOURCE5} Makefile
 find . -name .\*.swp -delete
+mv ../{colors,doc,ftdetect,ftplugin,syntax,CHANGELOG,INSTALL,README*,install.sh,LICENSE} .
 mv otl2html-* doc/otl2html
 mv otl_handler doc/otl_handler
 mv doc/otl2html/README README.otl2html
@ -85,13 +85,19 @@ fi
 %doc README.otl2html README.otl_handler README.Fedora LICENSE
 %doc examples
 %config(noreplace) %{_sysconfdir}/vimoutlinerrc
-%{_bindir}/otl2html
+#%_{_bindir}/otl2html
 %{_bindir}/vo_maketags
 %{_datadir}/vim/vimfiles/*/*
 %{_datadir}/mime/packages/vimoutliner.xml
 %{_mandir}/man1/*.1.gz

 %changelog
+* Fri May 18 2012 Matěj Cepl <mcepl@redhat.com> - 0.3.6-1
+- New upstream and new upstream version.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

--- a/6
+++ b/6
@ -8,8 +8,6 @@ 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/
@ -24,9 +22,7 @@ install-noarch:
 	   $(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
+	   $(DESTDIR)/usr/bin/vo_maketags \

 install-man:
 	install -m a+rx,u+w -d $(DESTDIR)/usr/share/man/man1/
--- a/vimoutliner-mc-build.patch
+++ b/vimoutliner-mc-build.patch
@ -1,19 +1,6 @@
-diff -up vimoutliner-0.3.4/ftdetect/vo_base.vim.MC-build vimoutliner-0.3.4/ftdetect/vo_base.vim
--- 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	2010-01-06 06:58:49.092484180 +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
-diff -up vimoutliner-0.3.4/ftplugin/vo_base.vim.MC-build vimoutliner-0.3.4/ftplugin/vo_base.vim
--- 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	2010-01-06 06:59:20.907497474 +0100
+diff -up vimoutliner/ftplugin/vo_base.vim.MC-build vimoutliner/ftplugin/vo_base.vim
+--- vimoutliner/ftplugin/vo_base.vim.MC-build	2011-05-21 01:53:45.000000000 +0200
+++ vimoutliner/ftplugin/vo_base.vim	2012-05-18 09:43:49.792318242 +0200
@@ -65,7 +65,7 @@ let b:current_syntax = "outliner"
 
 " User Preferences {{{1
@ -23,39 +10,10 @@ diff -up vimoutliner-0.3.4/ftplugin/vo_base.vim.MC-build vimoutliner-0.3.4/ftplu
 
 setlocal ignorecase			" searches ignore case
 setlocal smartcase			" searches use smart case
-@@ -656,7 +656,8 @@ setlocal tags^=$HOME/.vimoutliner/vo_tag
- 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 @@ while (s:idx != -1)
-     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
-diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/vo_base.vim
--- 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	2010-01-06 06:58:49.091483356 +0100
-@@ -219,7 +219,7 @@ syn sync fromstart
- 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 BT8 start=+^\(\t\)\{7} \S+
+diff -up vimoutliner/syntax/vo_base.vim.MC-build vimoutliner/syntax/vo_base.vim
+--- vimoutliner/syntax/vo_base.vim.MC-build	2011-05-21 01:53:45.000000000 +0200
+++ vimoutliner/syntax/vo_base.vim	2012-05-18 09:43:49.793318229 +0200
+@@ -231,7 +231,7 @@ syntax region BT8 start=+^\(\t\)\{7} \S+
 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
@ -64,7 +22,7 @@ diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/
 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 BT8 start=+^\(\t\)\{7}:+ s
+@@ -242,7 +242,7 @@ syntax region BT8 start=+^\(\t\)\{7}:+ s
 syntax region BT9 start=+^\(\t\)\{8}:+ skip=+^\(\t\)\{8}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
 
 "Preformatted body text {{{2
@ -73,7 +31,7 @@ diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/
 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 PT8 start=+^\(\t\)\{7};+ s
+@@ -253,7 +253,7 @@ syntax region PT8 start=+^\(\t\)\{7};+ s
 syntax region PT9 start=+^\(\t\)\{8};+ skip=+^\(\t\)\{8};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
 
 "Preformatted tables {{{2
@ -82,7 +40,7 @@ diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/
 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 TA8 start=+^\(\t\)\{7}|+ s
+@@ -264,7 +264,7 @@ syntax region TA8 start=+^\(\t\)\{7}|+ s
 syntax region TA9 start=+^\(\t\)\{8}|+ skip=+^\(\t\)\{8}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
 
 "wrapping user text {{{2
@ -91,7 +49,7 @@ diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/
 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 UT8 start=+^\(\t\)\{7}>+ s
+@@ -275,7 +275,7 @@ syntax region UT8 start=+^\(\t\)\{7}>+ s
 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
@ -100,7 +58,7 @@ diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/
 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 @@ setlocal com=sO:\:\ -,mO:\:\ \ ,eO:\:\:,
+@@ -292,7 +292,7 @@ setlocal com=sO:\:\ -,mO:\:\ \ ,eO:\:\:,
 
 " 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
@ -109,24 +67,27 @@ diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/
 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
-diff -up vimoutliner-0.3.4/vo_readme.txt.MC-build vimoutliner-0.3.4/vo_readme.txt
--- vimoutliner-0.3.4/vo_readme.txt.MC-build	2005-06-20 15:34:21.000000000 +0200
-+++ vimoutliner-0.3.4/vo_readme.txt	2010-01-06 06:58:49.092484180 +0100
-@@ -246,12 +246,12 @@ INSTALLING AND TESTING VIMOUTLINER      
-                 Ctrl+K is a VimOutliner synonym for Ctrl+]
-                 Ctrl+N is a VimOutliner synonym for Ctrl+T
+diff -up vimoutliner/vo_readme.txt.MC-build vimoutliner/vo_readme.txt
+--- vimoutliner/vo_readme.txt.MC-build	2011-05-10 01:09:26.000000000 +0200
+++ vimoutliner/vo_readme.txt	2012-05-18 09:46:56.432984912 +0200
+@@ -254,14 +254,13 @@ Note:
+     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*
+-                                                                     *vo-debian*
+-Debian Installation~
+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:
+-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.
+-    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*
+ ==============================================================================
+ Using VimOutliner On Other File Types                           *vo-other-files*