From 6fbd111f42ef01dd531129f2442a10632977069c Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Thu, 4 May 2023 15:23:50 +0800 Subject: [PATCH] generate_compatibility_deps in install stage Signed-off-by: Chunmei Xu --- vim.spec | 166 +++++++++++++++++++++++++++---------------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/vim.spec b/vim.spec index 9eebce6..a2238ee 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 %bcond_without gui %bcond_with default_editor @@ -75,11 +75,11 @@ BuildRequires: libselinux-devel BuildRequires: libsodium-devel %endif -%if "%{withlua}" == "1" +%if %{withlua} BuildRequires: lua-devel %endif -%if "%{withruby}" == "1" +%if %{withruby} BuildRequires: ruby ruby-devel %endif @@ -162,7 +162,7 @@ Requires: %{name}-common = %{EVR} Requires: which Provides: bundled(libvterm) Conflicts: vim-wrappers < 2:9.0 -%if "%{withlua}" == "1" +%if %{withlua} Suggests: lua-libs %endif @@ -170,7 +170,7 @@ Suggests: python3 Suggests: python3-libs Suggests: perl-devel -%if "%{withruby}" == "1" +%if %{withruby} Suggests: ruby Suggests: ruby-libs %endif @@ -206,18 +206,18 @@ Requires: gtk3 Requires: hicolor-icon-theme Requires: libattr >= 2.4 Requires: %{name}-common = %{EVR} - %if "%{withlua}" == "1" +%if %{withlua} Suggests: lua-libs - %endif +%endif Suggests: python3 Suggests: perl-devel Suggests: python3-libs - %if "%{withruby}" == "1" +%if %{withruby} Suggests: ruby Suggests: ruby-libs - %endif +%endif %description X11 When it comes to Vim, X11 allows for the use of Vim in a graphical environment, @@ -294,10 +294,10 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-canberra --disable-libsodium %make_build -%{__cp} vim minimal-vim -%{__make} clean +cp vim minimal-vim +make clean -%{__mv} -f os_unix.h.save os_unix.h +mv -f os_unix.h.save os_unix.h %if %{with gui} @@ -306,7 +306,7 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-tclinterp --with-x=yes --enable-xim --enable-multibyte --with-tlib=ncurses \ --enable-gtk3-check --enable-gui=gtk3 --with-compiledby="" --enable-cscope \ --with-modified-by="" \ - %if "%{withnetbeans}" == "1" + %if %{withnetbeans} --enable-netbeans \ %else --disable-netbeans \ @@ -316,12 +316,12 @@ perl -pi -e "s/vimrc/virc/" os_unix.h %else --disable-selinux \ %endif - %if "%{withruby}" == "1" + %if %{withruby} --enable-rubyinterp=dynamic \ %else --disable-rubyinterp \ %endif - %if "%{withlua}" == "1" + %if %{withlua} --enable-luainterp=dynamic \ %else --disable-luainterp \ @@ -334,8 +334,8 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --enable-fail-if-missing --enable-canberra %make_build -%{__cp} vim gvim -%{__make} clean +cp vim gvim +make clean %endif %configure CFLAGS="${CFLAGS} -DSYS_VIMRC_FILE='\"/etc/vimrc\"'" \ @@ -343,7 +343,7 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --enable-perlinterp=dynamic --disable-tclinterp --with-x=no \ --enable-gui=no --exec-prefix=%{_prefix} --enable-multibyte --enable-cscope --with-modified-by="" \ --with-tlib=ncurses --with-compiledby="" \ -%if "%{withnetbeans}" == "1" +%if %{withnetbeans} --enable-netbeans \ %else --disable-netbeans \ @@ -353,12 +353,12 @@ perl -pi -e "s/vimrc/virc/" os_unix.h %else --disable-selinux \ %endif -%if "%{withruby}" == "1" +%if %{withruby} --enable-rubyinterp=dynamic \ %else --disable-rubyinterp \ %endif -%if "%{withlua}" == "1" +%if %{withlua} --enable-luainterp=dynamic \ %else --disable-luainterp \ @@ -372,41 +372,36 @@ perl -pi -e "s/vimrc/virc/" os_unix.h --disable-canberra %make_build -%{__cp} %{name} enhanced-vim +cp %{name} enhanced-vim %install -%{__mkdir} -p %{buildroot}/%{_bindir} -%{__mkdir} -p %{buildroot}/%{data_dir}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} -%{__mkdir} -p %{buildroot}/%{data_dir}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} -%{__cp} -f %{SOURCE7} %{buildroot}/%{data_dir}/vimfiles/template.spec -%{__cp} runtime/doc/uganda.txt LICENSE - -%{__rm} -f README*.info +mkdir -p %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/%{data_dir}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} +mkdir -p %{buildroot}/%{data_dir}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} +cp -f %{SOURCE7} %{buildroot}/%{data_dir}/vimfiles/template.spec +cp runtime/doc/uganda.txt LICENSE +rm -f README*.info cd src %make_install BINDIR=%{_bindir} STRIP=/bin/true -%{__rm} -f %{buildroot}%{_bindir}/{vim,view} -%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps -%{__mkdir} -p %{buildroot}%{_libexecdir} -%{__install} -m755 minimal-vim %{buildroot}%{_libexecdir}/vi -%{__install} -m755 enhanced-vim %{buildroot}%{_bindir}/vim -%{__install} -m755 %{SOURCE12} %{buildroot}%{_bindir}/view -%{__install} -m755 %{SOURCE13} %{buildroot}%{_bindir}/vi +rm -f %{buildroot}%{_bindir}/{vim,view} +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps +mkdir -p %{buildroot}%{_libexecdir} +install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi +install -m755 enhanced-vim %{buildroot}%{_bindir}/vim +install -m755 %{SOURCE12} %{buildroot}%{_bindir}/view +install -m755 %{SOURCE13} %{buildroot}%{_bindir}/vi %if %{with gui} make installgtutorbin DESTDIR=%{buildroot} BINDIR=%{_bindir} -%{__install} -m755 gvim %{buildroot}%{_bindir}/gvim -%{__install} -p -m644 %{SOURCE3} \ - %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/gvim.png -%{__install} -p -m644 %{SOURCE4} \ - %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gvim.png -%{__install} -p -m644 %{SOURCE5} \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gvim.png -%{__install} -p -m644 %{SOURCE6} \ - %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/gvim.png - -%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/metainfo +install -m755 gvim %{buildroot}%{_bindir}/gvim +install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/gvim.png +install -p -m644 %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/gvim.png +install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gvim.png +install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/gvim.png + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/gvim.appdata.xml < @@ -452,9 +447,9 @@ done echo ".so man1/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1 echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 %else -%{__rm} %{buildroot}/%{_mandir}/man1/evim.* -%{__rm} %{buildroot}/%{_datadir}/applications/{vim,gvim}.desktop -%{__rm} %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png +rm %{buildroot}/%{_mandir}/man1/evim.* +rm %{buildroot}/%{_datadir}/applications/{vim,gvim}.desktop +rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png %endif ( cd %{buildroot} @@ -464,7 +459,7 @@ echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 ln -s -f %{_libexecdir}/vi .%{_bindir}/rvi ln -s -f vim .%{_bindir}/rvim perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 - %{__rm} -f .%{_mandir}/man1/rvim.1 + rm -f .%{_mandir}/man1/rvim.1 cp -p .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vi.1 ln -s -f vi.1 .%{_mandir}/man1/ex.1 ln -s -f vi.1 .%{_mandir}/man1/view.1 @@ -479,10 +474,10 @@ echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 ln -s -f gvim ./%{_bindir}/gex ln -s -f gvim ./%{_bindir}/gview - %if "%{desktop_file}" == "1" + %if %{desktop_file} desktop-file-install --dir %{buildroot}/%{_datadir}/applications %{buildroot}/%{_datadir}/applications/gvim.desktop %else - %{__mkdir} -p ./%{_sysconfdir}/X11/applnk/Applications + mkdir -p ./%{_sysconfdir}/X11/applnk/Applications cp %{buildroot}/%{_datadir}/applications/gvim.desktop \ ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop %endif @@ -493,7 +488,7 @@ echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1 ) pushd %{buildroot}/%{data_vimdir}/tutor -%{__mkdir} conv +mkdir conv iconv -f UTF8 -t UTF8 tutor.ja.utf-8 > conv/tutor.ja.utf-8 iconv -f CP1252 -t UTF8 tutor.ca > conv/tutor.ca iconv -f ISO-8859-2 -t UTF8 tutor.pl > conv/tutor.pl @@ -506,57 +501,59 @@ pushd %{buildroot}/%{data_vimdir}/tutor iconv -f KOI8R -t UTF8 tutor.ru > conv/tutor.ru iconv -f CP1252 -t UTF8 tutor.sv > conv/tutor.sv iconv -f CP1252 -t UTF8 tutor.it > conv/tutor.it - %{__mv} -f tutor.ja.euc tutor.ja.sjis tutor.ko.euc tutor.pl.cp1250 tutor.zh.big5 tutor.ru.cp1251 tutor.zh.euc tutor.sr.cp1250 tutor.sr.utf-8 conv/ - %{__rm} -f tutor.ca tutor.de tutor.es tutor.fr tutor.gr tutor.it tutor.ja.utf-8 tutor.ko.utf-8 tutor.no tutor.pl tutor.sk tutor.ru tutor.sv -%{__mv} -f conv/* . + mv -f tutor.ja.euc tutor.ja.sjis tutor.ko.euc tutor.pl.cp1250 tutor.zh.big5 tutor.ru.cp1251 tutor.zh.euc tutor.sr.cp1250 tutor.sr.utf-8 conv/ + rm -f tutor.ca tutor.de tutor.es tutor.fr tutor.gr tutor.it tutor.ja.utf-8 tutor.ko.utf-8 tutor.no tutor.pl tutor.sk tutor.ru tutor.sv +mv -f conv/* . rmdir conv popd -%{__chmod} 644 %{buildroot}/%{data_vimdir}/doc/vim2html.pl \ +chmod 644 %{buildroot}/%{data_vimdir}/doc/vim2html.pl \ %{buildroot}/%{data_vimdir}/tools/*.pl \ %{buildroot}/%{data_vimdir}/tools/vim132 -%{__chmod} 644 ../runtime/doc/vim2html.pl +chmod 644 ../runtime/doc/vim2html.pl -%{__mkdir} -p %{buildroot}%{_sysconfdir} -%{__install} -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc -%{__install} -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc +mkdir -p %{buildroot}%{_sysconfdir} +install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc +install -p -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc %if %{with default_editor} -%{__mkdir} -p %{buildroot}/%{_sysconfdir}/profile.d -%{__install} -p -m644 %{SOURCE9} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh -%{__install} -p -m644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh -%{__mkdir} -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/ -%{__install} -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish -%{__mkdir} -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ +mkdir -p %{buildroot}/%{_sysconfdir}/profile.d +install -p -m644 %{SOURCE9} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh +install -p -m644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh +mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/ +install -p -m644 %{SOURCE11} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish +mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/ %endif -%{__mkdir} -p %{buildroot}%{_rpmconfigdir}/macros.d/ -%{__install} -p -m644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/ +mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ +install -p -m644 %{SOURCE8} %{buildroot}%{_rpmconfigdir}/macros.d/ (cd ../runtime; %{__rm} -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) -%{__rm} -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c -%{__rm} -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/tools -%{__rm} -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl -%{__rm} -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ +rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c +rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/tools +rm -rf %{buildroot}/%{_datadir}/vim/%{vimdir}/doc/vim2html.pl +rm -f %{buildroot}/%{_datadir}/vim/%{vimdir}/tutor/tutor.gr.utf-8~ for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1 da.ISO8859-1 de.ISO8859-1 tr.ISO8859-9; do - %{__rm} -rf %{buildroot}/%{_mandir}/$i + rm -rf %{buildroot}/%{_mandir}/$i done -mv %{buildroot}/%{_mandir}/ru.UTF-8 \ - %{buildroot}/%{_mandir}/ru +mv %{buildroot}/%{_mandir}/ru.UTF-8 %{buildroot}/%{_mandir}/ru for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8 tr.UTF-8; do - %{__rm} -rf %{buildroot}/%{_mandir}/$i + rm -rf %{buildroot}/%{_mandir}/$i done echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/rvim.1 -%{__mkdir} -p %{buildroot}/%{_mandir}/man5 +mkdir -p %{buildroot}/%{_mandir}/man5 echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man5/vimrc.5 echo ".so man1/vi.1" > %{buildroot}/%{_mandir}/man5/virc.5 touch %{buildroot}/%{data_dir}/vimfiles/doc/tags +%generate_compatibility_deps + + %transfiletriggerin common -- %{data_dir}/vimfiles/doc %{_bindir}/vim -c ":helptags %{data_dir}/vimfiles/doc" -c :q &> /dev/null || : @@ -564,11 +561,8 @@ touch %{buildroot}/%{data_dir}/vimfiles/doc/tags > %{data_dir}/vimfiles/doc/tags || : %{_bindir}/vim -c ":helptags %{data_dir}/vimfiles/doc" -c :q &> /dev/null || : -%generate_compatibility_deps - %files common %config(noreplace) %{_sysconfdir}/vimrc -%{!?_licensedir:%global license %%doc} %doc runtime/docs %{data_vimdir}/colors %{data_vimdir}/compiler @@ -739,6 +733,8 @@ touch %{buildroot}/%{data_dir}/vimfiles/doc/tags %{_bindir}/vim %{_bindir}/vimdiff %{_bindir}/vimtutor +%dir %{abidir} +%{abidir}/vim-option.list %files filesystem %{_rpmconfigdir}/macros.d/macros.vim @@ -762,7 +758,7 @@ touch %{buildroot}/%{data_dir}/vimfiles/doc/tags %if %{with gui} %files X11 - %if "%{desktop_file}" == "1" + %if %{desktop_file} %{_datadir}/metainfo/*.appdata.xml /%{_datadir}/applications/* %exclude /%{_datadir}/applications/vim.desktop @@ -786,6 +782,7 @@ touch %{buildroot}/%{data_dir}/vimfiles/doc/tags %dir %{_datadir}/icons/locolor/* %dir %{_datadir}/icons/locolor/*/apps %{_datadir}/icons/locolor/*/apps/* +%{abidir}/gvim-option.list %endif %files data @@ -804,7 +801,10 @@ touch %{buildroot}/%{data_dir}/vimfiles/doc/tags %endif %changelog -* Wed Apr 12 2023 Heng Qi -2:9.0-5 +* Thu May 04 2023 Chunnmei Xu - - 2:9.0-6 +- generate_compatibility_deps in install stage + +* Wed Apr 12 2023 Heng Qi - 2:9.0-5 - Refactor the spec file * Tue Jan 31 2023 Funda Wang - 2:9.0-4 -- Gitee