Browse Source

vim-8.2.3356-1

Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
330e42cd44
1 changed files with 36 additions and 11 deletions
  1. 36 11
      v/vim/vim-vl.spec

+ 36 - 11
v/vim/vim-vl.spec

@@ -1,7 +1,9 @@
+%bcond_with vim_big
+
 # version, patch version
 %define vimversion	8.2
-%define vimsrcpversion	3290
-%define vimpversion	3290
+%define vimsrcpversion	3356
+%define vimpversion	3356
 
 %define vimsubdir	vim%(echo %{vimversion} | sed -e's/\\.//')
 #define vimdir		%{vimsubdir}
@@ -170,6 +172,7 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 ません.
 
 
+%if %{with big}
 %package big
 Summary: VIM editor with big features
 Summary(ja): 多機能版の VIM エディタ
@@ -195,6 +198,7 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 
 このパッケージではvimパッケージで提供されるVIMよりも多くの機能を含んだ
 VIMを提供しています.
+%endif
 
 
 %package huge
@@ -206,6 +210,9 @@ Requires: vim-common = %{version}
 Requires: %(perl -le 'use Config; print $Config{archlibexp}')
 Obsoletes: vim-color
 Obsoletes: vim-ruby, vim-python, vim-perl
+%if %{without big}
+Obsoletes: vim-big < %{version}-%{release}
+%endif
 
 %description huge
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -283,6 +290,7 @@ configuration) such as:
   * vim-X11-huge - vim-hugeをX対応にしたVIMパッケージ
 
 
+%if %{with big}
 %package X11-big
 Summary: VIM editor with big features and X11 support
 Summary(ja): X11 対応の多機能版 VIM エディタ
@@ -308,6 +316,7 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 
 このパッケージではvim-X11パッケージで提供されるVIMよりも,より多くの機
 能を含んだVIMを提供しています.
+%endif
 
 
 %package X11-huge
@@ -318,6 +327,9 @@ Requires(post): alternatives
 Requires: vim-X11-common = %{version}
 Requires: %(perl -le 'use Config; print $Config{archlibexp}')
 Provides: gvim
+%if %{without big}
+Obsoletes: vim-X11-big < %{version}-%{release}
+%endif
 
 %description X11-huge
 VIM-X11 is a version of the VIM editor which is configured to run on the X
@@ -391,12 +403,14 @@ mv shadow vim-X11-huge
  %configure %{configopts} %{features_x11} %{features_huge} && \
  make %{?_smp_mflags})
 
+%if %{with big}
 make shadow
 mv shadow vim-X11-big
 (cd vim-X11-big && \
  mkdir po && (cd po && ln -s ../../po/* .) && \
  %configure %{configopts} %{features_x11} %{features_big} && \
  make %{?_smp_mflags})
+%endif
 
 make shadow
 mv shadow vim-X11-normal
@@ -412,12 +426,14 @@ mv shadow vim-huge
  %configure %{configopts} %{features_nox11} %{features_huge} && \
  make %{?_smp_mflags})
 
+%if %{with big}
 make shadow
 mv shadow vim-big
 (cd vim-big && \
  mkdir po && (cd po && ln -s ../../po/* .) && \
  %configure %{configopts} %{features_nox11} %{features_big} && \
  make %{?_smp_mflags})
+%endif
 
 make shadow
 mv shadow vim-normal
@@ -451,9 +467,11 @@ cd src
 
 for d in vim-normal vim-big vim-huge vim-X11-normal vim-X11-big vim-X11-huge vim-tiny
 do
-  make -C$d DESTDIR=%{buildroot} STRIP=/bin/true installvimbin 
-  vimbin=`find %{buildroot} -name vim -type f`
-  mv $vimbin `dirname $vimbin`/`echo $d | sed -e's/^vim-/vim./'`
+  if [ -d "$d" ]; then
+    make -C$d DESTDIR=%{buildroot} STRIP=/bin/true installvimbin 
+    vimbin=`find %{buildroot} -name vim -type f`
+    mv $vimbin `dirname $vimbin`/`echo $d | sed -e's/^vim-/vim./'`
+  fi
 done
 make -Cvim-huge     DESTDIR=%{buildroot} STRIP=/bin/true installtools installtutor
 make -Cvim-X11-huge DESTDIR=%{buildroot} STRIP=/bin/true installtools installtutor installtutorbin
@@ -544,6 +562,7 @@ then
   update-alternatives --remove vi %{_bindir}/vim.normal
 fi
 
+%if %{with big}
 %post big
 update-alternatives \
   --install /bin/vi      vi      %{_bindir}/vim.big 41 \
@@ -565,6 +584,7 @@ if [ "$1" = "0" ]
 then
   update-alternatives --remove vi %{_bindir}/vim.big
 fi
+%endif
 
 %post huge
 update-alternatives \
@@ -617,6 +637,7 @@ then
   update-alternatives --remove gvim %{_bindir}/vim.X11-normal
 fi
 
+%if %{with big}
 %post X11-big
 update-alternatives \
   --install /bin/vi       vi       %{_bindir}/vim.X11-big 40 \
@@ -645,6 +666,7 @@ then
   update-alternatives --remove vi   %{_bindir}/vim.X11-big
   update-alternatives --remove gvim %{_bindir}/vim.X11-big
 fi
+%endif
 
 %post X11-huge
 update-alternatives \
@@ -675,12 +697,6 @@ then
   update-alternatives --remove gvim %{_bindir}/vim.X11-huge
 fi
 
-%post X11-common
-%{_bindir}/update-desktop-database %{_datadir}/applications >& /dev/null ||:
-
-%postun X11-common
-%{_bindir}/update-desktop-database %{_datadir}/applications >& /dev/null ||:
-
 
 %clean
 rm -rf %{buildroot}
@@ -766,9 +782,11 @@ rm -rf %{buildroot}
 %{binprefix}bin/vim.tiny
 %{_sysconfdir}/vimrc.tiny
 
+%if %{with big}
 %files big
 %defattr(-,root,root)
 %{_bindir}/vim.big
+%endif
 
 %files huge
 %defattr(-,root,root)
@@ -778,9 +796,11 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_bindir}/vim.X11-normal
 
+%if %{with big}
 %files X11-big
 %defattr(-,root,root)
 %{_bindir}/vim.X11-big
+%endif
 
 %files X11-huge
 %defattr(-,root,root)
@@ -788,6 +808,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.3356-1
+- new upstream release.
+- disabled vim-{,X11-}big.
+- dropped update-desktop-database scriptlets.
+
 * Thu Aug 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.3290-1
 - new upstream release.