From c81753ec791e08c9fd0b30e2322a6e263892bafbd68afc272561a35613569b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 23 Mar 2012 18:05:07 +0000
Subject: [PATCH 1/2] Accepting request 110846 from
 home:gregkh:branches:editors

Add patchlevel to the Version, this lets Tumbleweed handle versioning properly

OBS-URL: https://build.opensuse.org/request/show/110846
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=92
---
 vim.changes | 9 +++++++++
 vim.spec    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/vim.changes b/vim.changes
index 82d10d9..7650dbf 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Mar 23 17:43:36 UTC 2012 - gregkh@opensuse.org
+
+- add patchlevel to package version.  This makes it easier for proper version
+  to be determined, and to let other repos properly handle "which version is
+  newer than the other" without having to rely on the Release number, which osc
+  does not keep track of cross-repos.  Side effect, openSUSE:Tumbleweed can
+  properly include vim now.
+
 -------------------------------------------------------------------
 Wed Feb 29 12:55:57 UTC 2012 - mvyskocil@suse.cz
 
diff --git a/vim.spec b/vim.spec
index ae9d9fa..7bda3b8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -17,7 +17,7 @@
 
 
 Name:           vim
-Version:        7.3
+Version:        7.3.%{official_ptchlvl}
 Release:        0
 BuildRequires:  db-devel
 %if 0%{?suse_version} > 1020
@@ -82,7 +82,7 @@ Source:         ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
 Source3:        suse.vimrc
 Source4:        vimrc_example1
 Source5:        vimrc_example2
-Source6:        ANNOUNCEMENT.vim-%{version}
+Source6:        ANNOUNCEMENT.vim-%{pkg_version}
 Source8:        suse.gvimrc
 Source10:       README.Japanese-XIM
 Source13:       vitmp.c

From 4d9f6f488268e7b15ef56936787eff0303c132761292abb329cbd6bf89481e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sat, 24 Mar 2012 20:06:36 +0000
Subject: [PATCH 2/2] - Try to fix bnc#753907

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=93
---
 vim.changes |  5 +++++
 vim.spec    | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/vim.changes b/vim.changes
index 7650dbf..0f52b36 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Mar 24 20:08:15 UTC 2012 - idonmez@suse.com
+
+- Try to fix bnc#753907 
+
 -------------------------------------------------------------------
 Fri Mar 23 17:43:36 UTC 2012 - gregkh@opensuse.org
 
diff --git a/vim.spec b/vim.spec
index 7bda3b8..7357a92 100644
--- a/vim.spec
+++ b/vim.spec
@@ -16,6 +16,11 @@
 #
 
 
+%define pkg_version 7.3
+%define official_ptchlvl 456
+%define VIM_SUBDIR vim73
+%define site_runtimepath /usr/share/vim/site
+
 Name:           vim
 Version:        7.3.%{official_ptchlvl}
 Release:        0
@@ -46,11 +51,6 @@ BuildRequires:  gpm-devel
 BuildRequires:  gpm
 %endif
 #
-%define pkg_version 7.3
-%define official_ptchlvl 456
-%define VIM_SUBDIR vim73
-%define site_runtimepath /usr/share/vim/site
-#
 %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?jobs:-j%jobs}
 #
 %define vim_prereq %{name}-base = %{version}