Hello community,
here is the log from the commit of package vim
checked in at Wed Jul 12 20:58:06 CEST 2006.
--------
--- vim/vim.changes 2006-07-11 17:13:55.000000000 +0200
+++ vim/vim.changes 2006-07-12 11:01:30.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 12 11:00:58 CEST 2006 - kssingvo@suse.de
+
+- added new official patches 036-037
+- splitted vim-enhanced package with all features
+
+-------------------------------------------------------------------
Old:
----
patches-001-035.bz2
New:
----
vim-7.0-official_patches_001-37.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vim.spec ++++++
--- /var/tmp/diff_new_pack.mbi0dr/_old 2006-07-12 20:57:30.000000000 +0200
+++ /var/tmp/diff_new_pack.mbi0dr/_new 2006-07-12 20:57:30.000000000 +0200
@@ -11,13 +11,14 @@
# norootforbuild
Name: vim
+%define official_ptchlvl 37
BuildRequires: db-devel gettext-devel gpm gtk2-devel libacl-devel ncurses-devel python-devel ruby-devel tcl-devel update-alternatives update-desktop-files
License: Other License(s), see package
Group: Productivity/Editors/Vi
Provides: vi_clone
Autoreqprov: on
Version: 7.0
-Release: 1
+Release: 2
%define VIM_SUBDIR vim70
Summary: Vi IMproved
URL: http://www.vim.org/
@@ -38,7 +39,7 @@
Source14: vitmp.1
Source15: vim132
Source16: gvim.png
-Patch0: patches-001-035.bz2
+Patch0: %{name}-7.0-official_patches_001-%{official_ptchlvl}.bz2
Patch1: %{name}-7.0-no_nb.patch
Patch2: %{name}-7.0-gcc_overflow_check.patch
Patch3: %{name}-7.0-filetype_ycp.patch
@@ -90,6 +91,27 @@
--------
Bram Moolenaar
+%package enhanced
+Group: Productivity/Editors/Vi
+Requires: vim
+Summary: A version of the VIM editor which includes recent enhancements
+
+%description enhanced
+The vim-enhanced package contains a version of VIM with extra, recently
+introduced features like Ruby and TCL interpreters. It is a superset of
+features of the gvim package.
+
+Install the vim-enhanced package if you'd like to use a version of the
+VIM editor which includes recently added enhancements like interpreters
+for the Python and Perl scripting languages. You'll also need to
+install the base package 'vim', for online help, etc.
+
+
+
+Authors:
+--------
+ Bram Moolenaar
+
%prep
%setup -q -n %{VIM_SUBDIR} -b 1 -b 2
%patch
@@ -104,23 +126,6 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
-# %patch2
-# %patch4 -b .fontset
-# %patch5
-# %patch6 -p0
-# %patch8 -p1
-# %patch9 -p1
-# %patch10 -p1
-# %patch11 -p1
-# %patch12 -p1
-# %patch13 -p1
-# %patch14 -p1
-# %patch15
-# %if %suse_version > 900
-# %patch7 -p1
-# %endif
-# %patch16 -p1
-# %patch17 -p1
cp $RPM_SOURCE_DIR/vimrc_example* .
cp $RPM_SOURCE_DIR/ANNOUNCEMENT* .
rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
@@ -128,15 +133,17 @@
%build
pushd src
+#----------------------------------
+# build the small version of vim
+#----------------------------------
CFLAGS="$RPM_OPT_FLAGS -Wall -pipe -fno-strict-aliasing -fstack-protector-all"
export CFLAGS
./configure $RPM_ARCH-suse-linux \
--prefix=/usr \
--mandir=%{_mandir} \
- --with-features=huge \
+ --with-features=big \
--enable-cscope \
--enable-multibyte \
- --enable-sniff \
--with-compiledby='http://www.suse.de/' \
--without-x \
--disable-gpm \
@@ -149,12 +156,15 @@
# The make install below is ugly, but is there another way to get the sources
# out of the way before the reconfigure?
make prefix=$RPM_BUILD_ROOT/usr MANDIR=$RPM_BUILD_ROOT%{_mandir} STRIP=: install
+#-----------------------------------
+# build the graphical version of vim
+#-----------------------------------
make distclean
./configure $RPM_ARCH-suse-linux \
--bindir=/usr/X11R6/bin \
--prefix=/usr \
--mandir=%{_mandir} \
- --with-features=huge\
+ --with-features=huge \
--enable-cscope \
--enable-multibyte \
--enable-sniff \
@@ -169,10 +179,42 @@
--enable-max-features \
--enable-perlinterp \
--enable-pythoninterp \
+ --enable-xim
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e"
+mv gvim gvim.saved
+#-----------------------------------
+# build the enhanced version of vim
+#-----------------------------------
+make distclean
+./configure $RPM_ARCH-suse-linux \
+ --bindir=/usr/X11R6/bin \
+ --prefix=/usr \
+ --mandir=%{_mandir} \
+ --with-features=huge\
+ --enable-cscope \
+ --enable-multibyte \
+ --enable-sniff \
+ --with-compiledby='http://www.suse.de/' \
+ --with--gnome=/opt/gnome \
+ --with--gtk-prefix=/opt/gnome \
+ --with-python-config-dir=%{py_libdir}/config \
+ --with-vim-name=gvim \
+ --with-tclsh=%{_bindir}/tclsh \
+ --with-tlib=ncurses \
+ --with-x \
+ --enable-fontset \
+ --enable-gnome-check \
+ --enable-gtk2-check \
+ --enable-gui=gnome2 \
+ --enable-max-features \
+ --enable-perlinterp \
+ --enable-pythoninterp \
--enable-rubyinterp \
--enable-tclinterp \
--enable-xim
make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e"
+mv gvim vim-enhanced
+mv gvim.saved gvim
popd
gcc $RPM_OPT_FLAGS -Wall $RPM_SOURCE_DIR/vitmp.c -o vitmp
@@ -211,14 +253,15 @@
install -m 0644 $RPM_SOURCE_DIR/ycp.vim $RPM_BUILD_ROOT/usr/share/vim/%{VIM_SUBDIR}/syntax
install -m 0644 $RPM_SOURCE_DIR/changes.vim $RPM_BUILD_ROOT/usr/share/vim/%{VIM_SUBDIR}/syntax
install -m 0755 $RPM_SOURCE_DIR/vim132 $RPM_BUILD_ROOT/usr/share/vim/%{VIM_SUBDIR}/tools/vim132
-cp %{S:8} .
+install -m 0755 src/vim-enhanced $RPM_BUILD_ROOT/%{_bindir}
+cp %{SOURCE8} .
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/*ggvim*
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/gvimtutor*
install -m 755 vitmp $RPM_BUILD_ROOT/bin/
install -m 644 $RPM_SOURCE_DIR/vitmp.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/gvimtutor $RPM_BUILD_ROOT/usr/X11R6/bin/xxd
mkdir -p $RPM_BUILD_ROOT//usr/share/pixmaps
-install -m 644 %{S:16} $RPM_BUILD_ROOT/usr/share/pixmaps/
+install -m 644 %{SOURCE16} $RPM_BUILD_ROOT/usr/share/pixmaps/
%suse_update_desktop_file -i gvim TextEditor
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/ex
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/ggvim
@@ -271,7 +314,14 @@
/usr/X11R6/bin/eview
%doc $RPM_SOURCE_DIR/README.SuSE $RPM_SOURCE_DIR/README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc
+%files enhanced
+%defattr(-,root,root)
+/usr/bin/vim-enhanced
+
%changelog -n vim
+* Wed Jul 12 2006 - kssingvo@suse.de
+- added new official patches 036-037
+- splitted vim-enhanced package with all features
* Tue Jul 11 2006 - kssingvo@suse.de
- update to 7.0
o Spell checking support for about 50 languages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...