- apply all official patches up to 057

- add -extra.tar.gz to sources (needed by patching procedure)

Changed files:
    vim.spec -> 1.117

diff --git a/vim.spec b/vim.spec
index 41758593fe5a3164f1e7a03f1b8a7c8f31a7f42b..daab1a65abb560db17502a885f6aec07f899473e 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -11,8 +11,8 @@
 # _with_ruby           - with ruby interp
 # _with_tcl            - with tcl interp
 
-## %define             _ver            6.0
-## %define             _patchlevel     208
+%define                _ver            6.1
+%define                _patchlevel     057
 
 Summary:       Vi IMproved - a Vi clone
 Summary(de):   VIsual editor iMproved
@@ -24,20 +24,21 @@ Summary(ru):        Visual editor IMproved - 
 Summary(tr):   Geliþmiþ bir vi sürümü
 Summary(uk):   Visual editor IMproved - ´ÄÉÎÏ ÷¦ÒÎÉÊ òÅÄÁËÔÏÒ :)
 Name:          vim
-Version:       6.1
-Release:       3
+Version:       %{_ver}.%{_patchlevel}
+Release:       1
 Epoch:         4
 License:       Charityware
 Group:         Applications/Editors/Vim
 Source0:       ftp://ftp.vim.org/pub/editors/vim/unix/%{name}-%{version}.tar.bz2
 Source1:       ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{version}-lang.tar.gz
-Source2:       g%{name}-athena.desktop
-Source3:       g%{name}-motif.desktop
-Source4:       g%{name}-gtk.desktop
-Source5:       g%{name}-gnome.desktop
-#packed from   ftp://ftp.vim.org/pub/editors/vim/patches/6.0.*
-## Source6:    %{name}-patches-%{_ver}.%{_patchlevel}.tar.bz2
-Source7:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+Source2:       ftp://ftp.vim.org/pub/editors/vim/extra/%{name}-%{version}-extra.tar.gz
+# packed from  ftp://ftp.vim.org/pub/editors/vim/patches/6.1.*
+Source3:       %{name}-patches-%{_ver}.%{_patchlevel}.tar.bz2
+Source4:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+Source10:      g%{name}-athena.desktop
+Source11:      g%{name}-motif.desktop
+Source12:      g%{name}-gtk.desktop
+Source13:      g%{name}-gnome.desktop
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                %{name}-visual.patch
 Patch2:                %{name}-paths.patch
@@ -406,8 +407,15 @@ GNOME, 
 ÐÏ×ΦÓÔÀ ÇÒÁƦÞÎÉÍ ¦ÎÔÅÒÆÅÊÓÏÍ ÔÁ ЦÄÔÒÉÍËÏÀ ÍÉÛ¦.
 
 %prep
-%setup -q -b1 -n %{name}%(echo %{version} | sed -e "s#\.##g")
-## %setup -q -b1 -a6 -n %{name}%(echo %{_ver} | sed -e "s#\.##g")
+## setup -q -b1 -b2 -n %{name}%(echo %{version} | sed -e "s#\.##g")
+%setup -q -b1 -b2 -a3 -n %{name}%(echo %{_ver} | sed -e "s#\.##g")
+
+# skiping patches that are for "extra" package and apply the rest of official patches
+for f in patches/6.1.* ; do
+       echo "Applying official patch `basename $f` ..."
+       patch -s -p0 < $f
+done
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -417,14 +425,6 @@ GNOME, 
 %endif
 %patch5 -p1
 
-## # these patches are to "extra" package which we don't need (nor use)
-## rm -f patches/6.0.{ , }
-## # apply the rest of official patches
-## for f in patches/6.0.* ; do
-##     echo "Applying official patch `basename $f` ..."
-##     patch -s -p0 < $f
-## done
-
 %build
 cd src
 autoconf
@@ -612,12 +612,12 @@ ln -sf vi  $RPM_BUILD_ROOT/bin/rview
 %{!?_without_gtk:ln -sf gvim                   $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/gview}
 %{!?_without_gtk:ln -sf gvim                   $RPM_BUILD_ROOT%{_prefix}/X11R6/bin/rgview}
 
-%{!?_without_athena:install %{SOURCE2}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_motif: install %{SOURCE3}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_gtk:   install %{SOURCE4}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
-%{!?_without_gnome: install %{SOURCE5}         $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_athena:install %{SOURCE10}                $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_motif: install %{SOURCE11}                $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gtk:   install %{SOURCE12}                $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
+%{!?_without_gnome: install %{SOURCE13}                $RPM_BUILD_ROOT%{_applnkdir}/Development/Editors}
 
-bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT