SPECS: vim.spec - updated patches to build with bonobo component

[emes]

Author: emes                         Date: Fri Sep  9 20:12:43 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated patches to build with bonobo component

---- Files affected:
SPECS:
   vim.spec (1.311 -> 1.312) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.311 SPECS/vim.spec:1.312
--- SPECS/vim.spec:1.311	Sun Sep  4 23:38:42 2005
+++ SPECS/vim.spec	Fri Sep  9 22:12:35 2005
@@ -32,7 +32,7 @@
 Summary(uk):	Visual editor IMproved - ´ÄÉÎĎ ÷ŚŇÎÉĘ ňĹÄÁËÔĎŇ :)
 Name:		vim
 Version:	%{_ver}.%{_patchlevel}
-Release:	2
+Release:	3
 Epoch:		4
 License:	Charityware
 Group:		Applications/Editors/Vim
@@ -78,11 +78,12 @@
 Patch19:	%{name}-modprobe.patch
 Patch20:	%{name}-CAN-2005-0069.patch
 Patch21:	%{name}-gtkfilechooser.patch
-Patch22:	%{name}-doubleparenthesis.patch
-Patch23:	%{name}-lib64.patch
-Patch24:	%{name}-syntax-fstab.patch
+Patch22:	%{name}-gtkfilechooser-bonobo.patch
+Patch23:	%{name}-doubleparenthesis.patch
+Patch24:	%{name}-lib64.patch
+Patch25:	%{name}-syntax-fstab.patch
 
-Patch99:	http://www.opensky.ca/gnome-vim/vim-patches/%{name}-bonobo-20040115.patch
+Patch99:	%{name}-bonobo-20050909.patch
 Patch101:	ftp://ftp.vim.org/pub/editors/vim/patches/6.3/6.3.001
 Patch102:	ftp://ftp.vim.org/pub/editors/vim/patches/6.3/6.3.002
 Patch103:	ftp://ftp.vim.org/pub/editors/vim/patches/6.3/6.3.003
@@ -720,12 +721,13 @@
 %patch18 -p1
 %patch19 -p0 -b .modprobe
 %patch20 -p1
-%patch21 -p0
-%patch22 -p1
-%if "%{_lib}" == "lib64"
+%{!?with_bonobo:%patch21 -p0}
+%{?with_bonobo:%patch22 -p1}
 %patch23 -p1
-%endif
+%if "%{_lib}" == "lib64"
 %patch24 -p1
+%endif
+%patch25 -p1
 
 install %{SOURCE15} runtime/indent
 install %{SOURCE16} runtime/colors
@@ -1339,6 +1341,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.312  2005/09/09 20:12:35  emes
+- updated patches to build with bonobo component
+
 Revision 1.311  2005/09/04 21:38:42  glen
 - kvim should be tropped
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.311&r2=1.312&f=u