From 2254697261710230c69a42bc84c63c834a22e655058bc7aa14d2365dddfd1822 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 6 Nov 2009 15:49:38 +0000 Subject: [PATCH 1/5] Accepting request 23803 from home:coolo:branches:openSUSE:Factory:branched Copy from home:coolo:branches:openSUSE:Factory:branched/vim via accept of submit request 23803 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/23803 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=9 --- vim-7.0-no_nb.patch | 18 ++++++++++-------- vim.changes | 5 +++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/vim-7.0-no_nb.patch b/vim-7.0-no_nb.patch index f773597..60461cb 100644 --- a/vim-7.0-no_nb.patch +++ b/vim-7.0-no_nb.patch @@ -1,29 +1,31 @@ ---- vim70/src/po/Makefile.orig 2006-04-02 13:28:36.000000000 +0200 -+++ vim70/src/po/Makefile 2006-07-11 10:29:14.000000000 +0200 -@@ -16,7 +16,7 @@ +Index: vim72/src/po/Makefile +=================================================================== +--- vim72.orig/src/po/Makefile ++++ vim72/src/po/Makefile +@@ -18,7 +18,7 @@ LANGUAGES = \ it \ ja \ ko \ - no \ + nb \ pl \ + pt_BR \ ru \ - sk \ -@@ -40,7 +40,7 @@ +@@ -45,7 +45,7 @@ MOFILES = \ it.mo \ ja.mo \ ko.mo \ - no.mo \ + nb.mo \ pl.mo \ + pt_BR.mo \ ru.mo \ - sk.mo \ -@@ -74,7 +74,7 @@ +@@ -82,7 +82,7 @@ CHECKFILES = \ it.ck \ ja.ck \ ko.ck \ - no.ck \ + nb.ck \ pl.ck \ + pt_BR.ck \ ru.ck \ - sk.ck \ diff --git a/vim.changes b/vim.changes index 9d438a8..abeee8a 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:50 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz From 2e4148ea8bf0fa5d4d3346345973f7270e0734e81b31ad8ba9704075ac7d8e42 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 10 Nov 2009 09:29:37 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=10 --- vim-7.0-no_nb.patch | 18 ++++++++---------- vim.changes | 5 ----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/vim-7.0-no_nb.patch b/vim-7.0-no_nb.patch index 60461cb..f773597 100644 --- a/vim-7.0-no_nb.patch +++ b/vim-7.0-no_nb.patch @@ -1,31 +1,29 @@ -Index: vim72/src/po/Makefile -=================================================================== ---- vim72.orig/src/po/Makefile -+++ vim72/src/po/Makefile -@@ -18,7 +18,7 @@ LANGUAGES = \ +--- vim70/src/po/Makefile.orig 2006-04-02 13:28:36.000000000 +0200 ++++ vim70/src/po/Makefile 2006-07-11 10:29:14.000000000 +0200 +@@ -16,7 +16,7 @@ it \ ja \ ko \ - no \ + nb \ pl \ - pt_BR \ ru \ -@@ -45,7 +45,7 @@ MOFILES = \ + sk \ +@@ -40,7 +40,7 @@ it.mo \ ja.mo \ ko.mo \ - no.mo \ + nb.mo \ pl.mo \ - pt_BR.mo \ ru.mo \ -@@ -82,7 +82,7 @@ CHECKFILES = \ + sk.mo \ +@@ -74,7 +74,7 @@ it.ck \ ja.ck \ ko.ck \ - no.ck \ + nb.ck \ pl.ck \ - pt_BR.ck \ ru.ck \ + sk.ck \ diff --git a/vim.changes b/vim.changes index abeee8a..9d438a8 100644 --- a/vim.changes +++ b/vim.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:09:50 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz From 68035fb94c0c0980bbbb14cb80f1e494762c5145a7b861707f0bbf1e6a29e723 Mon Sep 17 00:00:00 2001 From: Hendrik Vogelsang Date: Thu, 11 Feb 2010 12:42:04 +0000 Subject: [PATCH 3/5] Accepting request 31933 from home:prusnak:branches:editors Copy from home:prusnak:branches:editors/vim via accept of submit request 31933 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/31933 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=11 --- vim-7.0-no_nb.patch | 18 ++++++++++-------- vim.changes | 10 ++++++++++ vim.spec | 13 ++++++++----- 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/vim-7.0-no_nb.patch b/vim-7.0-no_nb.patch index f773597..60461cb 100644 --- a/vim-7.0-no_nb.patch +++ b/vim-7.0-no_nb.patch @@ -1,29 +1,31 @@ ---- vim70/src/po/Makefile.orig 2006-04-02 13:28:36.000000000 +0200 -+++ vim70/src/po/Makefile 2006-07-11 10:29:14.000000000 +0200 -@@ -16,7 +16,7 @@ +Index: vim72/src/po/Makefile +=================================================================== +--- vim72.orig/src/po/Makefile ++++ vim72/src/po/Makefile +@@ -18,7 +18,7 @@ LANGUAGES = \ it \ ja \ ko \ - no \ + nb \ pl \ + pt_BR \ ru \ - sk \ -@@ -40,7 +40,7 @@ +@@ -45,7 +45,7 @@ MOFILES = \ it.mo \ ja.mo \ ko.mo \ - no.mo \ + nb.mo \ pl.mo \ + pt_BR.mo \ ru.mo \ - sk.mo \ -@@ -74,7 +74,7 @@ +@@ -82,7 +82,7 @@ CHECKFILES = \ it.ck \ ja.ck \ ko.ck \ - no.ck \ + nb.ck \ pl.ck \ + pt_BR.ck \ ru.ck \ - sk.ck \ diff --git a/vim.changes b/vim.changes index 9d438a8..d6f73ab 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Feb 9 17:01:46 CET 2010 - prusnak@suse.cz + +- build data subpackage as noarch + +------------------------------------------------------------------- +Tue Nov 3 19:09:50 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Tue Oct 13 12:04:46 CEST 2009 - mmarek@suse.cz diff --git a/vim.spec b/vim.spec index 972a1e8..ea3c046 100644 --- a/vim.spec +++ b/vim.spec @@ -20,9 +20,9 @@ Name: vim Version: 7.2 -Release: 15 +Release: 16 # -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 # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -126,11 +126,14 @@ Authors: Bram Moolenaar %package data -License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} # Summary: Vi IMproved +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description data Vim (Vi IMproved) is an almost compatible version of the UNIX editor @@ -153,7 +156,7 @@ Authors: Bram Moolenaar %package base -License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} PreReq: update-alternatives @@ -255,7 +258,7 @@ Authors: %endif %package -n gvim -License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda +License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda Group: Productivity/Editors/Vi PreReq: %{gvim_prereq} PreReq: update-alternatives From 202a1d49395580e08f1970819a036958894d80983e0ec3a38b3b67c9a6a5b24a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2010 18:39:28 +0000 Subject: [PATCH 4/5] Updating link to change in openSUSE:Factory/vim revision 41.0 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=5b258c56373a5b4b83b22e2092a1d41e --- vim.changes | 5 +++++ vim.spec | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/vim.changes b/vim.changes index d6f73ab..3efcf3c 100644 --- a/vim.changes +++ b/vim.changes @@ -3,6 +3,11 @@ Tue Feb 9 17:01:46 CET 2010 - prusnak@suse.cz - build data subpackage as noarch +------------------------------------------------------------------- +Tue Feb 9 17:01:46 CET 2010 - prusnak@suse.cz + +- build data subpackage as noarch + ------------------------------------------------------------------- Tue Nov 3 19:09:50 UTC 2009 - coolo@novell.com diff --git a/vim.spec b/vim.spec index ea3c046..43d190e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,7 +1,7 @@ # # spec file for package vim (Version 7.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Name: vim Version: 7.2 -Release: 16 +Release: 17 # -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 # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +103,9 @@ Patch100: vim-7.1.314-CVE-2009-0316-debian.patch # tbd??? %name-6.3-initvals.diff # tbd??? vim64-svn-crash.patch Summary: Vi IMproved +%if 0%{?suse_version} >= 1120 +BuildArch: noarch +%endif %description Vim (Vi IMproved) is an almost compatible version of the UNIX editor @@ -126,7 +129,7 @@ Authors: Bram Moolenaar %package data -License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} # @@ -156,7 +159,7 @@ Authors: Bram Moolenaar %package base -License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi PreReq: %{vim_prereq} PreReq: update-alternatives @@ -258,7 +261,7 @@ Authors: %endif %package -n gvim -License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda +License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda Group: Productivity/Editors/Vi PreReq: %{gvim_prereq} PreReq: update-alternatives From fc9ac6d396e277e7ce4c69571a7873596790929983557c4eeb502c59c7f53f66 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 11 Feb 2010 18:39:28 +0000 Subject: [PATCH 5/5] checked in (request 32186) OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=12 --- vim.changes | 5 ----- vim.spec | 3 --- 2 files changed, 8 deletions(-) diff --git a/vim.changes b/vim.changes index 3efcf3c..d6f73ab 100644 --- a/vim.changes +++ b/vim.changes @@ -3,11 +3,6 @@ Tue Feb 9 17:01:46 CET 2010 - prusnak@suse.cz - build data subpackage as noarch -------------------------------------------------------------------- -Tue Feb 9 17:01:46 CET 2010 - prusnak@suse.cz - -- build data subpackage as noarch - ------------------------------------------------------------------- Tue Nov 3 19:09:50 UTC 2009 - coolo@novell.com diff --git a/vim.spec b/vim.spec index 43d190e..edc98b5 100644 --- a/vim.spec +++ b/vim.spec @@ -103,9 +103,6 @@ Patch100: vim-7.1.314-CVE-2009-0316-debian.patch # tbd??? %name-6.3-initvals.diff # tbd??? vim64-svn-crash.patch Summary: Vi IMproved -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description Vim (Vi IMproved) is an almost compatible version of the UNIX editor