- Run spec-cleaner and fix build on SLE 10

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=33
This commit is contained in:
Ismail Dönmez 2011-04-18 15:03:21 +00:00 committed by Git OBS Bridge
parent 6bdbee2075
commit b84e44fedb
2 changed files with 113 additions and 116 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 18 15:00:38 UTC 2011 - idoenmez@novell.com
- Run spec-cleaner and fix build on SLE 10
-------------------------------------------------------------------
Mon Feb 28 21:33:24 CET 2011 - stian@viskjer.net

224
vim.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: vim
@ -24,9 +23,22 @@ Release: 2
#
License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
Group: Productivity/Editors/Vi
BuildRequires: db-devel
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
BuildRequires: gettext-devel
BuildRequires: libacl-devel
BuildRequires: ncurses-devel
BuildRequires: perl
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: python-devel
BuildRequires: ruby-devel
BuildRequires: tcl-devel
BuildRequires: update-alternatives
BuildRequires: update-desktop-files
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: db-devel fdupes gettext-devel gtk2-devel libacl-devel ncurses-devel perl python-devel ruby-devel tcl-devel update-alternatives update-desktop-files
%if 0%{?suse_version} > 1130
BuildRequires: gpm-devel
%else
@ -48,17 +60,22 @@ BuildRequires: gpm
%else
%define gvim_prereq %{vim_prereq}
%endif
#
PreReq: sh-utils fileutils
PreReq: update-alternatives
PreReq: %{vim_prereq}
#
PreReq: fileutils
PreReq: sh-utils
PreReq: update-alternatives
#
Provides: vim_client
Provides: vi
#
%if 0%{?suse_version} >= 1010
Recommends: vim-data = %{version}
%endif
# tbd??? %{name}-6.3-ga-utf8.diff
# tbd??? %{name}-6.3-initvals.diff
# tbd??? vim64-svn-crash.patch
Summary: Vi IMproved
#
Url: http://www.vim.org/
Source: ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
@ -80,30 +97,44 @@ Source22: vim.conf
Source23: apparmor.vim
Source98: %{name}-7.3-patches.tar.bz2
Source99: %{name}-7.3-rpmlintrc
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch3: %{name}-7.3-disable_lang_no.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch4: %{name}-7.3-gvimrc_fontset.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch5: %{name}-7.3-highlight_fstab.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch6: %{name}-7.3-sh_is_bash.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch7: %{name}-7.3-filetype_ftl.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch8: %{name}-7.3-help_tags.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch9: %{name}-7.3-use_awk.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch10: %{name}-7.3-name_vimrc.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch11: %{name}-7.3-mktemp_tutor.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch12: %{name}-7.3-ruby_ldflags_configure.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch14: %{name}-7.3-grub.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch15: %{name}-7.3-filetype_apparmor.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch18: %{name}-7.3-filetype_spec.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch19: %{name}-7.3-diff_check.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch21: %{name}-7.3-filetype_changes.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch22: %{name}-7.3-filetype_mine.patch
# TODO: why is this not applied anymore?
Patch25: vim-7.2-lzma-support.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch27: %{name}-7.3-disable_gcc_warning_eval_c.patch
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch100: vim-7.1.314-CVE-2009-0316-debian.patch
# tbd??? %name-6.3-ga-utf8.diff
# tbd??? %name-6.3-initvals.diff
# tbd??? vim64-svn-crash.patch
Summary: Vi IMproved
%description
Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@ -120,18 +151,12 @@ For SUSE Linux, Vim is used as /usr/bin/vi.
Package vim contains the normal version of vim. To get the full runtime
environment install additionally vim-data.
Authors:
--------
Bram Moolenaar <bram@vim.org>
%package data
License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
Group: Productivity/Editors/Vi
PreReq: %{vim_prereq}
#
Summary: Vi IMproved
Group: Productivity/Editors/Vi
PreReq: %{vim_prereq}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
@ -150,19 +175,13 @@ For SUSE Linux, Vim is used as /usr/bin/vi.
Package vim-data contains the runtime files.
Authors:
--------
Bram Moolenaar <bram@vim.org>
%package base
License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
#
Summary: Vi IMproved
Group: Productivity/Editors/Vi
PreReq: %{vim_prereq}
PreReq: update-alternatives
#
Summary: Vi IMproved
%description base
Vim (Vi IMproved) is an almost compatible version of the UNIX editor
@ -181,22 +200,16 @@ versions. You still need to select at least one of the vim,
vim-enhanced or gvim packages. For full runtime support you might also
want to install the vim-data package.
Authors:
--------
Bram Moolenaar <bram@vim.org>
%package enhanced
License: Other uncritical OpenSource License
#
Summary: A version of the VIM editor which includes recent enhancements
Group: Productivity/Editors/Vi
PreReq: %{vim_prereq}
PreReq: update-alternatives
Requires: %{perl_requires}
Provides: vi
Provides: vim_client
Requires: %{perl_requires}
#
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
@ -210,68 +223,50 @@ for the Python and Perl scripting languages. You'll also need to
install the base package 'vim', for online help, etc. If you need the
graphical features of vim, you might want to install package gvim too.
Authors:
--------
Bram Moolenaar <bram@vim.org>
%if 0%{?with_splitted_gvim}
%package -n gvim-base
License: Other uncritical OpenSource License
#
Summary: dummy package for a subpackage only build in the buildservice
Group: Productivity/Editors/Vi
PreReq: %{vim_prereq}
PreReq: update-alternatives
Requires: gvim_client
#
Summary: dummy package for a subpackage only build in the buildservice
%description -n gvim-base
dummy package for a subpackage only build in the buildservice
Authors:
--------
Bram Moolenaar <mool@oce.nl>
%package -n gvim-enhanced
License: Other uncritical OpenSource License
#
Summary: dummy package for a subpackage only build in the buildservice
Group: Productivity/Editors/Vi
PreReq: %{gvim_prereq}
PreReq: update-alternatives
Provides: vim_client
Provides: gvim_client
Provides: vi
#
Summary: dummy package for a subpackage only build in the buildservice
%description -n gvim-enhanced
dummy package for a subpackage only build in the buildservice
Authors:
--------
Bram Moolenaar <mool@oce.nl>
%endif
%package -n gvim
License: Other uncritical OpenSource License ; Charityware. If you wish please donate to Uganda
#
Summary: A GUI for Vi
Group: Productivity/Editors/Vi
PreReq: %{gvim_prereq}
PreReq: update-alternatives
Requires: %{perl_requires}
Requires: gvim_client
Provides: gvim-base = %{version}-%{release}
Provides: gvim-enhanced = %{version}-%{release}
Provides: gvim-base = %{version}
Provides: gvim-enhanced = %{version}
Provides: gvim_client
Provides: vim_client
Provides: vi
Requires: %{perl_requires}
#
Summary: A GUI for Vi
%description -n gvim
Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed.
@ -282,12 +277,6 @@ You need package vim for the help and other documentation too. If you
want less features, you might want to install packages vim-enhanced or
vim instead.
Authors:
--------
Bram Moolenaar <mool@oce.nl>
%prep
%setup -q -n %{VIM_SUBDIR} -b 98
for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
@ -309,7 +298,7 @@ unset p
%patch12 -p1
%patch14 -p1
%patch15 -p1
cp %{S:23} runtime/syntax/apparmor.vim
cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch18 -p1
%patch19 -p1
%patch21 -p1
@ -317,13 +306,13 @@ cp %{S:23} runtime/syntax/apparmor.vim
#%patch25
%patch27 -p1
%patch100 -p1
cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} .
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
#rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
#rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
%build
export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"
%if %suse_version > 1000
%if 0%{?suse_version} > 1000
export CFLAGS="$CFLAGS -fstack-protector-all"
%endif
export COMMON_OPTIONS="\
@ -362,23 +351,23 @@ export GUI_OPTIONS="\
--disable-rubyinterp --disable-tclinterp
sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
%make
%{__cp} src/vim vim-normal
%{__make} distclean
cp src/vim vim-normal
make distclean
#
# build enhanced binary
%configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} --disable-gui
sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
%make
%{__cp} src/vim vim-enhanced
%{__make} distclean
cp src/vim vim-enhanced
make distclean
#
# build enhanced gvim binary
%configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} ${GUI_OPTIONS}
sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
%if 0%{?with_splitted_gvim}
%make
%{__cp} src/vim gvim-enhanced
%{__make} distclean
cp src/vim gvim-enhanced
make distclean
#
# build gvim binary
%configure ${COMMON_OPTIONS} ${GUI_OPTIONS}
@ -387,52 +376,52 @@ sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h
%make
#
# build vitmp
gcc %{optflags} %{S:13} -o vitmp
gcc %{optflags} %{SOURCE13} -o vitmp
%install
#
# create icon directory to have the icon from the tarball installed
%{__install} -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
%makeinstall STRIP=:
# the last installed binary is gvim. preserve it and
# fix its symlinks. e* was added here as it doesnt make much sense in
# console
%{__mv} -v %{buildroot}%{_bindir}/{vim,gvim-normal}
mv -v %{buildroot}%{_bindir}/{vim,gvim-normal}
for f in egvim egview eview evim gex gvi gview gvimdiff rgview rgvim ; do
%{__ln_s} -vf gvim %{buildroot}%{_bindir}/$f
ln -s -vf gvim %{buildroot}%{_bindir}/$f
done
#
# install the other binaries
%{__install} -D -m 0755 vim-normal %{buildroot}/bin/vim-normal
%{__install} -D -m 0755 vim-enhanced %{buildroot}%{_bindir}/vim-enhanced
install -D -m 0755 vim-normal %{buildroot}/bin/vim-normal
install -D -m 0755 vim-enhanced %{buildroot}%{_bindir}/vim-enhanced
%if 0%{?with_splitted_gvim}
%{__install} -D -m 0755 gvim-enhanced %{buildroot}%{_bindir}/gvim-enhanced
install -D -m 0755 gvim-enhanced %{buildroot}%{_bindir}/gvim-enhanced
%endif
# compat symlinks
# we need a dummy target for /etc/alternatives/vim
mkdir -p %{buildroot}/etc/alternatives
touch %{buildroot}/etc/alternatives/vim
%{__ln_s} -f /etc/alternatives/vim %{buildroot}/bin/vim
%{__ln_s} -f /bin/vim %{buildroot}/bin/vi
%{__ln_s} -f /bin/vim %{buildroot}%{_bindir}/vim
%{__ln_s} -f /bin/vim %{buildroot}%{_bindir}/vi
%{__ln_s} -f vim %{buildroot}%{_bindir}/edit
%{__ln_s} -f /bin/vim %{buildroot}/bin/ex
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/vim
ln -s -f /etc/alternatives/vim %{buildroot}/bin/vim
ln -s -f /bin/vim %{buildroot}/bin/vi
ln -s -f /bin/vim %{buildroot}%{_bindir}/vim
ln -s -f /bin/vim %{buildroot}%{_bindir}/vi
ln -s -f vim %{buildroot}%{_bindir}/edit
ln -s -f /bin/vim %{buildroot}/bin/ex
#
# man pages
%{__ln_s} -f vim.1.gz %{buildroot}%{_mandir}/man1/vi.1.gz
%{__ln_s} -f vim.1.gz %{buildroot}%{_mandir}/man1/ex.1.gz
ln -s -f vim.1.gz %{buildroot}%{_mandir}/man1/vi.1.gz
ln -s -f vim.1.gz %{buildroot}%{_mandir}/man1/ex.1.gz
#
# vitmp
%{__install} -m 0755 vitmp %{buildroot}%{_bindir}/vitmp
%{__install} -m 0644 %{S:14} %{buildroot}%{_mandir}/man1/vitmp.1
%{__install} -m 0755 %{S:15} %{buildroot}/usr/share/vim/%{VIM_SUBDIR}/tools/vim132
install -m 0755 vitmp %{buildroot}%{_bindir}/vitmp
install -m 0644 %{SOURCE14} %{buildroot}%{_mandir}/man1/vitmp.1
install -m 0755 %{SOURCE15} %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/vim132
#
# make the vim settings more generic
%{__ln_s} -f %{VIM_SUBDIR} %{buildroot}%{_datadir}/vim/current
ln -s -f %{VIM_SUBDIR} %{buildroot}%{_datadir}/vim/current
# additional files
%{__install} -D -m 0644 %{S:3} %{buildroot}/etc/vimrc
%{__install} -D -m 0644 %{S:8} %{buildroot}/etc/gvimrc
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/vimrc
install -D -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/gvimrc
# create site wide runtime directory
mkdir -p -m 0755 %{buildroot}%{site_runtimepath}/after
mkdir -m 0755 %{buildroot}%{site_runtimepath}/autoload
@ -443,29 +432,29 @@ mkdir -m 0755 %{buildroot}%{site_runtimepath}/syntax
mkdir -m 0755 %{buildroot}%{site_runtimepath}/ftdetect
mkdir -m 0755 %{buildroot}%{site_runtimepath}/after/syntax
mkdir -m 0755 %{buildroot}%{_datadir}/vim/current/skeletons
mkdir -m 0755 %{buildroot}/etc/skel
mkdir -m 0755 %{buildroot}%{_sysconfdir}/skel
# install spec helper
install -m 0644 %{S:20} %{buildroot}%{_datadir}/vim/current/skeletons/skeleton.spec
install -m 0644 %{S:21} %{buildroot}/etc/skel/.vimrc
install -m 0644 %{SOURCE20} %{buildroot}%{_datadir}/vim/current/skeletons/skeleton.spec
install -m 0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/skel/.vimrc
# desktop file for gvim
%suse_update_desktop_file -i gvim Utility TextEditor
#
# documentation
%{__install} -d -m 0755 %{buildroot}%{_docdir}/{,g}vim/
%{__install} -D -m 0644 \
install -d -m 0755 %{buildroot}%{_docdir}/{,g}vim/
install -D -m 0644 \
vimrc_example1 vimrc_example2 suse.vimrc \
README.txt README_src.txt README_unix.txt src/INSTALL ANNOUNCEMENT.vim-7.3 \
%{buildroot}%{_docdir}/vim/
# gvim
%{__install} -D -m 0644 \
install -D -m 0644 \
README.SuSE README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \
%{buildroot}%{_docdir}/gvim/
#
# stupid helper
%{__install} -m 0755 %{S:18} %{buildroot}%{_datadir}/vim/current/tools/missing-vim-client
# For /var/run on tmpfs
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/
install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/
install -m 0755 %{SOURCE18} %{buildroot}%{_datadir}/vim/current/tools/missing-vim-client
# For /var/run on tmpfs
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d/
install -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/tmpfiles.d/
# remove unecessary duplicate manpages
rm -rf %{buildroot}%{_mandir}/fr.ISO8859-1/
rm -rf %{buildroot}%{_mandir}/fr.UTF-8/
@ -480,12 +469,15 @@ mv %{buildroot}%{_mandir}/ru.UTF-8 %{buildroot}%{_mandir}/ru
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c
#
%if 0%{?suse_version} > 1020
%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang
%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor
%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin
%endif
%clean
%{__rm} -rf %{buildroot}
rm -rf %{buildroot}
# link name | name | binary | priority
%post
@ -547,11 +539,11 @@ fi
%files base
%defattr(-,root,root,-)
%config(noreplace) /etc/vimrc
%config(noreplace) /etc/skel/.vimrc
%ghost /etc/alternatives/vim
%dir /etc/tmpfiles.d
%config(noreplace) /etc/tmpfiles.d/vim.conf
%config(noreplace) %{_sysconfdir}/vimrc
%config(noreplace) %{_sysconfdir}/skel/.vimrc
%ghost %{_sysconfdir}/alternatives/vim
%dir %{_sysconfdir}/tmpfiles.d
%config(noreplace) %{_sysconfdir}/tmpfiles.d/vim.conf
# symlinks
/bin/vi
/bin/vim
@ -690,7 +682,7 @@ fi
%defattr(-,root,root,-)
%endif
%doc %{_docdir}/gvim
%ghost %config(missingok) /etc/gvimrc
%ghost %config(missingok) %{_sysconfdir}/gvimrc
%{_bindir}/egview
%{_bindir}/egvim
%{_bindir}/eview