vim/nano: fix for filesystem < 3.0

nano/nano.spec

@@ -2,7 +2,7 @@
 Summary:         A small text editor
 Name:            nano
 Version:         7.2
-Release:         2%{?dist}
+Release:         3%{?dist}
 License:         GPLv3+ MIT
 URL:             https://www.nano-editor.org
 Source:          https://www.nano-editor.org/dist/v3/%{name}-%{version}.tar.xz
@@ -35,7 +35,7 @@ GNU nano is a small and friendly text editor.
 mkdir build
 cd build
 %global _configure ../configure
-%configure
+%configure  --bindir=/bin
 make %{?_smp_mflags}
 
 # generate default /etc/nanorc
@@ -49,7 +49,7 @@ sed -e 's/# set nowrap/set nowrap/' \
 
 %install
 cd build
-%make_install
+%make_install bindir=/bin
 rm -f %{buildroot}%{_infodir}/dir
 
 # remove installed HTML documentation
@@ -65,6 +65,10 @@ pushd %{buildroot}%{_datadir}/nano-syntax-highlighting
     done
 popd
 
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+ln -s ../../bin/nano ${RPM_BUILD_ROOT}%{_bindir}/nano
+ln -s ../../bin/rnano ${RPM_BUILD_ROOT}%{_bindir}/rnano
+
 install -m644 %{SOURCE4} %{buildroot}%{_datadir}/nano-syntax-highlighting/v.nanorc
 install -m644 %{SOURCE5} %{buildroot}%{_datadir}/nano-syntax-highlighting/Brewfile.nanorc
 echo -e "\n# Improved syntax highlighting for nano from various projects\ninclude %{_datadir}/nano-syntax-highlighting/*.nanorc" >> nanorc
@@ -109,6 +113,7 @@ exit 0
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 %doc build/doc/sample.nanorc
 %doc doc/{faq,nano}.html
+/bin/*
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/nanorc
 %{_mandir}/man*/*
@@ -117,6 +122,9 @@ exit 0
 %{_datadir}/nano-syntax-highlighting
 
 %changelog
+* Thu Feb  8 2024 Raven <raven@sysadmins.ws> - 7.2-3
+- use default html highlighing for twig and j2 files
+
 * Sun Dec 24 2023 Raven <raven@sysadmins.ws> - 7.2-2
 - Fix nanorc.nanorc syntax
 

vim/vim.spec

@@ -56,7 +56,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 # swift.vim contains Apache 2.0 with runtime library exception:
 # which is taken as Apache-2.0 WITH Swift-exception - reported to legal as https://gitlab.com/fedora/legal/fedora-license-data/-/issues/188
@@ -568,10 +568,11 @@ cd src
 rm -f %{buildroot}%{_bindir}/{vim,view}
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
 mkdir -p %{buildroot}%{_libexecdir}
+install -d -m755  %{buildroot}/bin
 install -m755 minimal-vim %{buildroot}%{_libexecdir}/vi
 install -m755 enhanced-vim %{buildroot}%{_bindir}/vim
-install -m755 %{SOURCE12} %{buildroot}%{_bindir}/view
+install -m755 %{SOURCE12} %{buildroot}/bin/view
-install -m755 %{SOURCE13} %{buildroot}%{_bindir}/vi
+install -m755 %{SOURCE13} %{buildroot}/bin/vi
 
 %if %{with gui}
 make installgtutorbin  DESTDIR=%{buildroot} BINDIR=%{_bindir}
@@ -598,9 +599,9 @@ rm %{buildroot}/%{_datadir}/icons/{hicolor,locolor}/*/apps/gvim.png
 %endif
 
 ( cd %{buildroot}
-  ln -sf %{_libexecdir}/vi .%{_bindir}/rvi
+  ln -sf %{_libexecdir}/vi ./bin/rvi
-  ln -sf %{_libexecdir}/vi .%{_bindir}/rview
+  ln -sf %{_libexecdir}/vi ./bin/rview
-  ln -sf %{_libexecdir}/vi .%{_bindir}/ex
+  ln -sf %{_libexecdir}/vi ./bin/ex
   ln -sf vim .%{_bindir}/rvim
   ln -sf vim .%{_bindir}/vimdiff
   perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1
@@ -707,6 +708,10 @@ 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
 done
 
+for i in ex rview view; do
+  rm -f %{buildroot}/%{_bindir}/$i
+done
+
 # Install symlink for rvim man page
 echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/rvim.1
 
@@ -878,11 +883,11 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 %files minimal
 %config(noreplace) %{_sysconfdir}/virc
-%{_bindir}/ex
+/bin/ex
-%{_bindir}/rvi
+/bin/rvi
-%{_bindir}/rview
+/bin/rview
-%{_bindir}/vi
+/bin/vi
-%{_bindir}/view
+/bin/view
 %{_libexecdir}/vi
 %{_mandir}/man1/vi.*
 %{_mandir}/man1/ex.*