X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=vim.spec;h=3c0813a9a9112fc6fb7b097cc07f79b2d812cbae;hb=84e8f2ec8b4cbd3b4d31133d35e80d64aebcc65f;hp=7b4c963e2da04c46b14b69e0a4d0d8492737ad8a;hpb=16bc28c1c281bd157fe2c825ea3eda7ee06a7009;p=packages%2Fvim.git diff --git a/vim.spec b/vim.spec index 7b4c963..3c0813a 100644 --- a/vim.spec +++ b/vim.spec @@ -8,6 +8,7 @@ %bcond_without heavy # don't build heavy (full-featured GNOME-based gvim/vim) %bcond_without gui # don't build any GUI %bcond_without light # don't build light (minimal, ncurses, but not static) +%bcond_with lua # with Lua interp in vim package %bcond_with perl # with Perl interp in vim package %bcond_with python # with Python interp in vim package %bcond_with ruby # with Ruby interp in vim package @@ -25,11 +26,10 @@ # Command to check for latest patch: # wget ftp://ftp.vim.org/pub/editors/vim/patches/7.4/MD5SUMS -O sources # tail -n1 sources | awk '{print $2}' -# VCS Commits: https://code.google.com/p/vim/source/browse/ +# VCS Commits: https://github.com/vim/vim/commits/master -%define ver 7.4 -%define patchlevel 761 -%define rel 1 +%define ver 7.4.979 +%define rel 4 Summary: Vi IMproved - a Vi clone Summary(de.UTF-8): VIsual editor iMproved Summary(es.UTF-8): Editor visual incrementado @@ -41,22 +41,19 @@ Summary(ru.UTF-8): Visual editor IMproved - Единственно Правил Summary(tr.UTF-8): Gelişmiş bir vi sürümü Summary(uk.UTF-8): Visual editor IMproved - Єдино Вірний Редактор :) Name: vim -Version: %{ver}.%{patchlevel} +Version: %{ver} +# keep macro for release, otherwise people tend to increment Epoch instead Release: %{rel} Epoch: 4 License: Charityware Group: Applications/Editors/Vim -Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2 -# Source0-md5: 607e135c559be642f210094ad023dc65 +#Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2 +Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz +# Source0-md5: dc289e3d5dd1b25e1e976ce7e704b47c Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f Source2: http://skawina.eu.org/mikolaj/usr_doc_pl.zip # Source2-md5: ff96284b1c913d55cf0877839b34d490 -Source10: g%{name}-athena.desktop -Source11: g%{name}-motif.desktop -Source12: g%{name}-gtk.desktop -Source13: g%{name}-gnome.desktop -Source14: %{name}.desktop Source15: update-source.sh # syntax files # http://www.vim.org/scripts/script.php?script_id=1491 (0.7.5) @@ -72,7 +69,6 @@ Source31: borland.vim Source32: oceandeep.vim # http://www.vim.org/scripts/script.php?script_id=1464 (2.6.3) Source33: moria.vim -%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/%{ver}/%{ver}.%03g 1 %{patchlevel} Patch0: %{name}-sysconfdir.patch Patch1: %{name}-visual.patch Patch2: %{name}-paths.patch @@ -86,10 +82,8 @@ Patch9: %{name}-modprobe.patch Patch10: %{name}-doubleparenthesis.patch Patch11: %{name}-syntax-fstab.patch Patch12: 010_all_%{name}-6.3-vixie.patch -Patch13: 013_all_%{name}-7.0-cron-vars-79981.patch Patch14: 020_all_%{name}-7.0-fstab-tmpfs-size.patch Patch15: 021_all_%{name}-7.0-fstab-bogus-errors.patch -Patch16: 024_all_%{name}-6.3-bash-83565.patch Patch17: 027_all_%{name}-7.0-automake-substitutions-93378.patch Patch18: %{name}-smarty.patch Patch19: %{name}-tutor-lessdeps.patch @@ -104,7 +98,6 @@ Patch27: %{name}-autopaste.patch Patch28: %{name}-ft-cron.patch Patch29: %{name}-phpscript.patch Patch30: %{name}-pam.patch -Patch31: %{name}-ft-bash.patch Patch32: %{name}-localedir.patch Patch33: %{name}-locales.patch Patch34: %{name}-rtdir.patch @@ -113,6 +106,8 @@ Patch36: %{name}-ft-lib-udevrules.patch Patch37: %{name}-ft-mysql.patch Patch38: %{name}-ft-gyp.patch Patch39: %{name}-revert-7.4.165-noundo.patch +Patch40: desktop.patch +Patch41: %{name}-lua.patch URL: http://www.vim.org/ BuildRequires: acl-devel BuildRequires: autoconf @@ -131,6 +126,9 @@ BuildRequires: gtk+2-devel >= 2:2.6.0 %if %{with selinux} || %{with heavy} BuildRequires: libselinux-devel %endif +%if %{with lua} || %{with heavy} +BuildRequires: lua52-devel +%endif %{?with_motif:BuildRequires: motif-devel} BuildRequires: ncurses-devel BuildRequires: pkgconfig @@ -172,6 +170,8 @@ Provides: vim-editor = %{epoch}:%{version}-%{release} Obsoletes: vim-enhanced Obsoletes: vim-ispell Obsoletes: vim-plugin-multvals +Obsoletes: vim-syntax-golang <= 1.3.3-1 +Obsoletes: vim-syntax-lxc-docker <= 0.9.0-1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # configure redefines it to =1 @@ -737,10 +737,12 @@ zawierającą obsługę skryptów w językach Perl, Python, Ruby oraz Tcl jak również GUI GTK+2. %prep -%setup -q -n %{name}74 +%setup -q -# official patches -%patchset_patch 1 %{patchlevel} +cp -p runtime/gvim.desktop gvim-athena.desktop +cp -p runtime/gvim.desktop gvim-gnome.desktop +cp -p runtime/gvim.desktop gvim-gtk.desktop +cp -p runtime/gvim.desktop gvim-motif.desktop %patch0 -p1 %patch1 -p1 @@ -755,10 +757,8 @@ jak również GUI GTK+2. %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p0 %patch17 -p0 %patch18 -p1 %patch19 -p1 @@ -776,7 +776,6 @@ jak również GUI GTK+2. %patch28 -p1 %patch29 -p1 %patch30 -p1 -%patch31 -p1 %patch32 -p1 %patch33 -p1 %patch34 -p1 @@ -785,6 +784,8 @@ jak również GUI GTK+2. %patch37 -p1 %patch38 -p1 %patch39 -p1 +%patch40 -p1 +%patch41 -p1 cp -p %{SOURCE20} runtime/syntax cp -p %{SOURCE22} runtime/syntax @@ -829,6 +830,7 @@ build() { %{__make} -j1 distclean # add common options, can override (disable) if needed with args %configure \ + --%{!?with_lua:dis}%{?with_lua:en}able-luainterp \ --%{!?with_perl:dis}%{?with_perl:en}able-perlinterp \ --%{!?with_python:dis}%{?with_python:en}able-pythoninterp \ --%{!?with_ruby:dis}%{?with_ruby:en}able-rubyinterp \ @@ -857,6 +859,7 @@ build vim.static \ --disable-gui \ --without-x \ --with-features=small \ + --disable-luainterp \ --disable-perlinterp \ --disable-pythoninterp \ --disable-rubyinterp \ @@ -874,6 +877,7 @@ build vim.light \ --disable-gui \ --without-x \ --with-features=small \ + --disable-luainterp \ --disable-perlinterp \ --disable-pythoninterp \ --disable-rubyinterp \ @@ -943,6 +947,7 @@ build vim.heavy \ --with-features=huge \ --disable-gui \ --without-x \ + --enable-luainterp \ --enable-perlinterp \ --enable-pythoninterp \ --enable-rubyinterp \ @@ -955,6 +960,7 @@ build gvim.heavy \ --enable-gtk2-check \ --enable-gnome-check \ --with-x \ + --enable-luainterp \ --enable-perlinterp \ --enable-pythoninterp \ --enable-rubyinterp \ @@ -975,6 +981,9 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/vim,%{_bindir}} \ %{__make} -j1 install \ DESTDIR=$RPM_BUILD_ROOT +# generic gvim from upstream, but we have bunch of subpackages +%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/gvim.desktop + # not supported locales added by 7.3.764 or later %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cs.cp1250 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ja.sjis @@ -1023,22 +1032,21 @@ ln -sf vi $RPM_BUILD_ROOT/bin/ex ln -sf vi $RPM_BUILD_ROOT/bin/view ln -sf vi $RPM_BUILD_ROOT/bin/rview -cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_desktopdir} - %if %{with athena} -install -p src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena -cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_desktopdir} +install -p src/bin/gvim.athena $RPM_BUILD_ROOT%{_bindir}/gvim.athena +cp -p gvim-athena.desktop $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with motif} -install -p src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif -cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir} +install -p src/bin/gvim.motif $RPM_BUILD_ROOT%{_bindir}/gvim.motif +cp -p gvim-motif.desktop $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gnome} -install -p src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome -cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_desktopdir} +install -p src/bin/gvim.gnome $RPM_BUILD_ROOT%{_bindir}/gvim.gnome +cp -p gvim-gnome.desktop $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with gtk} install -p src/bin/gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim.gtk +cp -p gvim-gtk.desktop $RPM_BUILD_ROOT%{_desktopdir} ln -sf gvim.gtk $RPM_BUILD_ROOT%{_bindir}/gvim ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/eview ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/evim @@ -1046,7 +1054,6 @@ ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/gview ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/gvimdiff ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/rgview ln -sf gvim $RPM_BUILD_ROOT%{_bindir}/rgvim -cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_desktopdir} %endif %if %{with heavy} install -p src/bin/vim.heavy $RPM_BUILD_ROOT%{_bindir} @@ -1136,7 +1143,7 @@ rm -rf $RPM_BUILD_ROOT %lang(ru) %{_mandir}/ru/man1/rvim.1* %lang(ru) %{_mandir}/ru/man1/vim.1* %lang(ru) %{_mandir}/ru/man1/vimdiff.1* -%{_desktopdir}/%{name}.desktop +%{_desktopdir}/vim.desktop %if %{with static} %files static