rpms / vim

Clone
Source Code
GIT

6f071e redo patches, drop obsolete patches

Authored and Committed by Karsten Hopp 8 years ago
raw patch tree parent
5 files changed. 23 lines added. 35 lines removed.
vim-7.4-checkhl.patch
file modified
+3 -3
vim-7.4-releasestring-1318991.patch
file modified
+6 -6
vim-7.4-spec_rfc822.patch
file removed
-14
vim-7.4-specsyntax.patchvim-6.2-specsyntax.patch
file renamed
+8 -7
vim.spec
file modified
+6 -5 
    redo patches, drop obsolete patches
file modified
+3 -3
vim-7.4-checkhl.patch CHANGED
@@ -1,11 +1,11 @@
1
1
diff -up vim74/runtime/syntax/spec.vim.kh1 vim74/runtime/syntax/spec.vim
2
- --- vim74/runtime/syntax/spec.vim.kh1 2015-11-04 11:37:16.483417787 +0100
3
- +++ vim74/runtime/syntax/spec.vim 2015-11-04 11:37:38.033528045 +0100
2
+ --- vim74/runtime/syntax/spec.vim.kh1 2016-08-04 15:23:25.275955301 +0200
3
+ +++ vim74/runtime/syntax/spec.vim 2016-08-04 15:24:56.699417602 +0200
4
4
@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
5
5
syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
6
6
7
7
"%% Scripts Section %%
8
- -syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
8
+ -syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
9
9
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|check\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
10
10
11
11
"%% Changelog Section %%
file modified
+6 -6
vim-7.4-releasestring-1318991.patch CHANGED
@@ -1,10 +1,10 @@
1
1
diff -up vim74/runtime/ftplugin/spec.vim.1318991 vim74/runtime/ftplugin/spec.vim
2
- --- vim74/runtime/ftplugin/spec.vim.1318991 2016-04-26 13:01:33.781838194 +0200
3
- +++ vim74/runtime/ftplugin/spec.vim 2016-04-26 13:02:41.958130012 +0200
4
- @@ -40,8 +40,8 @@ else:
5
- headers = spec.packages[0].header
6
- version = headers['Version']
7
- release = ".".join(headers['Release'].split(".")[:-1])
2
+ --- vim74/runtime/ftplugin/spec.vim.1318991 2016-08-04 15:29:42.423862424 +0200
3
+ +++ vim74/runtime/ftplugin/spec.vim 2016-08-04 15:31:08.797299188 +0200
4
+ @@ -41,8 +41,8 @@ else:
5
+ headers = spec.sourceHeader
6
+ version = headers["Version"]
7
+ release = headers["Release"]
8
8
- vim.command("let ver = " + version)
9
9
- vim.command("let rel = " + release)
10
10
+ vim.command("let ver = '" + version + "'")
file removed
-14
vim-7.4-spec_rfc822.patch DELETED
@@ -1,14 +0,0 @@
1
- diff -up vim74/runtime/ftplugin/spec.vim.rfc822 vim74/runtime/ftplugin/spec.vim
2
- --- vim74/runtime/ftplugin/spec.vim.rfc822 2016-04-13 12:31:09.856418963 +0200
3
- +++ vim74/runtime/ftplugin/spec.vim 2016-04-13 12:32:22.091802791 +0200
4
- @@ -113,7 +113,10 @@ if !exists("*s:SpecChangelog")
5
- endif
6
- endif
7
- if (chgline != -1)
8
- + let tmptime = v:lc_time
9
- + language time C
10
- let parsed_format = "* ".strftime(format)." - ".ver."-".rel
11
- + execute "language time" tmptime
12
- let release_info = "+ ".name."-".ver."-".rel
13
- let wrong_format = 0
14
- let wrong_release = 0
vim-7.4-specsyntax.patch vim-6.2-specsyntax.patch
file renamed
+8 -7
vim-6.2-specsyntax.patch → vim-7.4-specsyntax.patch RENAMED
@@ -1,6 +1,7 @@
1
- --- vim62d/runtime/syntax/spec.vim.highlite 2003-05-13 14:48:55.000000000 +0200
2
- +++ vim62d/runtime/syntax/spec.vim 2003-05-13 14:52:51.000000000 +0200
3
- @@ -38,7 +38,7 @@
1
+ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim
2
+ --- vim74/runtime/syntax/spec.vim.highlite 2016-07-04 10:17:45.000000000 +0200
3
+ +++ vim74/runtime/syntax/spec.vim 2016-08-04 15:20:26.116049343 +0200
4
+ @@ -38,7 +38,7 @@ syn match specNoNumberHilite 'X11\|X11R6
4
5
syn match specManpageFile '[a-zA-Z]\.1'
5
6
6
7
"Day, Month and most used license acronyms
@@ -9,7 +10,7 @@
9
10
syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
10
11
syn keyword specMonth contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
11
12
syn keyword specMonth contained January February March April May June July August September October November December
12
- @@ -61,9 +61,9 @@
13
+ @@ -61,9 +61,9 @@ syn cluster specListedFiles contains=spe
13
14
14
15
"specComands
15
16
syn match specConfigure contained '\./configure'
@@ -21,12 +22,12 @@
21
22
syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
22
23
23
24
"frequently used rpm env vars
24
- @@ -105,7 +105,7 @@
25
+ @@ -105,7 +105,7 @@ syn case ignore
25
26
"%% PreAmble Section %%
26
27
"Copyright and Serial were deprecated by License and Epoch
27
28
syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
28
- -syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
29
- +syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ExcludeOS\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
29
+ -syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
30
+ +syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExcludeOS\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
30
31
31
32
"%% Description Section %%
32
33
syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
file modified
+6 -5
vim.spec CHANGED
@@ -21,7 +21,7 @@ Summary: The VIM editor
21
21
URL: http://www.vim.org/
22
22
Name: vim
23
23
Version: %{baseversion}.%{patchlevel}
24
- Release: 1%{?dist}
24
+ Release: 2%{?dist}
25
25
License: Vim
26
26
Group: Applications/Editors
27
27
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -46,7 +46,7 @@ Source17: ftplugin-spec.vim
46
46
Source18: syntax-spec.vim
47
47
48
48
Patch2002: vim-7.0-fixkeys.patch
49
- Patch2003: vim-6.2-specsyntax.patch
49
+ Patch2003: vim-7.4-specsyntax.patch
50
50
%if %{withhunspell}
51
51
Patch2011: vim-7.0-hunspell.patch
52
52
BuildRequires: hunspell-devel
@@ -63,8 +63,7 @@ Patch3010: vim-7.3-manpage-typo-668894-675480.patch
63
63
Patch3011: vim-manpagefixes-948566.patch
64
64
Patch3012: vim-7.4-licensemacro-1151450.patch
65
65
Patch3013: vim-7.4-globalsyntax.patch
66
- Patch3014: vim-7.4-spec_rfc822.patch
66
+ Patch3014: vim-7.4-releasestring-1318991.patch
67
- Patch3015: vim-7.4-releasestring-1318991.patch
68
67
69
68
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
70
69
BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@@ -218,7 +217,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
218
217
%patch3012 -p1
219
218
%patch3013 -p1
220
219
%patch3014 -p1
221
- %patch3015 -p1
222
220
223
221
%build
224
222
cp -f %{SOURCE6} .
@@ -746,6 +744,9 @@ rm -rf %{buildroot}
746
744
%{_datadir}/icons/hicolor/*/apps/*
747
745
748
746
%changelog
747
+ * Tue Aug 04 2016 Karsten Hopp <karsten@redhat.com> 7.4.1989-2
748
+ - redo patches, some upstream updates broke them
749
+
749
750
* Tue Jul 05 2016 Karsten Hopp <karsten@redhat.com> 7.4.1989-1
750
751
- patchlevel 1989
751
752

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation