diff --git a/.gitignore b/.gitignore index c59c441..3b27374 100644 --- a/.gitignore +++ b/.gitignore @@ -5,14 +5,3 @@ /vile-9.8m.tgz /vile-9.8n.tgz /vile-9.8o.tgz -/vile-9.8p.tgz -/vile-9.8q.tgz -/vile-9.8r.tgz -/vile-9.8s.tgz -/vile-9.8t.tgz -/vile-9.8u.tgz -/vile-9.8w.tgz -/vile-9.8y.tgz -/vile-9.8z.tgz -/vile-9.8za.tgz -/vile-9.8zb.tgz diff --git a/sources b/sources index c22fd0a..e6a4120 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vile-9.8zb.tgz) = cce86f8aab814026dd1275e6491b025670fcabff52160e5fec2b070427c8d42e843bd17f9235d8991d6ea77ffd4c14e11cc59b0cef006f2d7aa8393d48bb72b3 +5340ec37cfaf91c8e69897a4ff984d74 vile-9.8o.tgz diff --git a/vile.spec b/vile.spec index ed7ded1..71bde41 100644 --- a/vile.spec +++ b/vile.spec @@ -1,28 +1,27 @@ Name: vile -Version: 9.8zb -Release: 9%{?dist} +Version: 9.8o +Release: 1%{?dist} Summary: VI Like Emacs -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only -URL: https://invisible-island.net/vile/ -Source0: https://invisible-island.net/archives/vile/current/%{name}-%{version}.tgz -BuildRequires: make +Group: Applications/Editors +License: GPLv2 +URL: http://invisible-island.net/vile/ +Source0: ftp://invisible-island.net/vile/current/%{name}-%{version}.tgz +Source1: xvile.desktop BuildRequires: ncurses-devel -BuildRequires: libxcrypt-devel BuildRequires: flex -BuildRequires: gcc BuildRequires: desktop-file-utils Requires: %{name}-common = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %package common -Summary: The common files needed by any version of the vile editor +Summary: The common files needed by any version of the VIM editor +Group: Applications/Editors %package -n xvile Summary: VI Like Emacs +Group: Applications/Editors BuildRequires: libXpm-devel -BuildRequires: libXaw-devel BuildRequires: libXt-devel -BuildRequires: perl-generators Requires: xorg-x11-fonts-misc Requires: %{name}-common = %{version}-%{release} @@ -30,7 +29,7 @@ Requires: %{name}-common = %{version}-%{release} %description common vile is a text editor which is extremely compatible with vi in terms of "finger feel". In addition, it has extended capabilities in many areas, notably -multi-file editing and viewing, syntax highlighting, and key rebinding. +multi-file editing and viewing, syntax highlighting, and key rebinding. vile-common provides the files needed for all versions of vile. %description -n xvile @@ -38,61 +37,62 @@ xvile is a text editor which is extremely compatible with vi in terms of "finger feel". In addition, it has extended capabilities in many areas, notably multi-file editing and viewing, syntax highlighting, and key rebinding. -%description +%description vile is a text editor which is extremely compatible with vi in terms of "finger feel". In addition, it has extended capabilities in many areas, notably multi-file editing and viewing, syntax highlighting, and key rebinding. %prep - -# loadable filters are mistreated by rpmbuild -#define debug_package #{nil} - %setup -q %build %configure --with-loadable-filters \ - --disable-rpath-hack \ - --disable-stripping + --disable-rpath-hack \ + --disable-stripping make %{?_smp_mflags} vile -DESKTOP_FLAGS=--vendor='' \ %configure --with-loadable-filters \ - --disable-rpath-hack \ - --disable-stripping \ - --with-app-defaults=%{_datadir}/X11/app-defaults \ - --with-screen=Xaw \ + --disable-rpath-hack \ + --disable-stripping \ + --with-app-defaults=%{_datadir}/X11/app-defaults \ + --with-screen=x11 \ --with-icon-theme \ - --with-icondir=%{_datadir}/icons/ \ + --with-icondir=%{_datadir}/icons/ \ --with-pixmapdir=%{_datadir}/pixmaps/ \ - --with-xpm + --with-xpm make %{?_smp_mflags} xvile touch vile -%check -make check - %install make install DESTDIR=%{buildroot} INSTALL='install -p' TARGET='xvile' make install DESTDIR=%{buildroot} INSTALL='install -p' TARGET='vile' -make install-desktop DESKTOP_FLAGS=--vendor='' DESKTOP_DIR=%{buildroot}%{_datadir}/applications +desktop-file-install --vendor='' --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} -rm -v -f %{buildroot}%{_datadir}/applications/lxvile.desktop -rm -v -f %{buildroot}%{_datadir}/applications/uxvile.desktop +ln -s %{_mandir}/man1/xvile.1 %{buildroot}%{_mandir}/man1/uxvile.1 +ln -s %{_mandir}/man1/xvile.1 %{buildroot}%{_mandir}/man1/lxvile.1 + + +%post -n xvile +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun -n xvile +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans -n xvile +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -pushd %{buildroot}%{_mandir}/man1 -ln -s xvile.1 uxvile.1 -ln -s xvile.1 lxvile.1 -popd %files %{_bindir}/vile %{_bindir}/vile-pager %{_bindir}/vile-libdir-path %{_bindir}/vile-to-html -%{_mandir}/man1/vile*.1.gz +%{_mandir}/man1/vile.1* %files common %doc AUTHORS COPYING CHANGES README doc/*doc @@ -108,7 +108,7 @@ popd %{_bindir}/xvile-pager %{_bindir}/xvile-libdir-path %{_bindir}/xvile-to-html -%{_mandir}/man1/xvile*.1.gz +%{_mandir}/man1/xvile.1* %{_mandir}/man1/lxvile.1* %{_mandir}/man1/uxvile.1* %{_datadir}/pixmaps/vile.xpm @@ -117,138 +117,7 @@ popd %{_datadir}/X11/app-defaults/UXVile %{_datadir}/applications/xvile.desktop - %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 9.8zb-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Mon Feb 02 2026 Thomas E. Dickey - 9.8zb-1 -- Update to 9.8zb (RHBZ#2435863) - -* Sat Jan 17 2026 Fedora Release Engineering - 9.8za-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 9.8za-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Feb 01 2025 Björn Esser - 9.8za-6 -- Add explicit BR: libxcrypt-devel - -* Tue Jan 28 2025 Thomas E. Dickey - 9.8za-1 -- Update to 9.8za - -* Sun Jan 19 2025 Fedora Release Engineering - 9.8z-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 9.8z-4 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 9.8z-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 9.8z-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Thomas E. Dickey - 9.8z-1 -- Update to 9.8z - -* Sat Jul 22 2023 Fedora Release Engineering - 9.8y-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 28 2023 Thomas E. Dickey - 9.8y-1 -- Update to 9.8y - -* Sat Jan 21 2023 Fedora Release Engineering - 9.8x-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 02 2023 Thomas E. Dickey - 9.8x-1 -- Update to 9.8x - -* Sat Sep 10 2022 Thomas E. Dickey - 9.8w-1 -- Update to 9.8w -- Use desktop file from upstream. -- Use Xaw rather than plain X11 for xvile screentype, to provide menus. -- Change absolute symbolic links for manpage to relative. - -* Sat Jul 23 2022 Fedora Release Engineering - 9.8u-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 9.8u-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 9.8u-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 9.8u-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 9.8u-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon May 18 2020 Mark McKinstry - 9.8u-1 -- Update to 9.8u (RHBZ#1836721) - -* Fri Jan 31 2020 Fedora Release Engineering - 9.8t-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 9.8t-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 9.8t-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Björn Esser - 9.8t-2 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Fri Dec 07 2018 Filipe Rosset - 9.8t-1 -- update to latest upstream 9.8t -- changelog http://invisible-island.net/vile/CHANGES.html#v9_8t - -* Thu Sep 13 2018 Filipe Rosset - 9.8s-1 -- rebuilt to latest upstream 9.8s - -* Tue Jul 31 2018 Florian Weimer - 9.8r-9 -- Rebuild with fixed binutils - -* Sat Jul 28 2018 Mark McKinstry - 9.8r-8 -- add BuildRequires for gcc (RHBZ#1606646) - -* Sat Jul 14 2018 Fedora Release Engineering - 9.8r-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Filipe Rosset - 9.8r-6 -- Remove obsolete scriptlets + spec modernization - -* Sat Jan 20 2018 Björn Esser - 9.8r-5 -- Rebuilt for switch to libxcrypt - -* Thu Aug 03 2017 Fedora Release Engineering - 9.8r-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 9.8r-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 9.8r-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jul 29 2016 Mark McKinstry - 9.8r-1 -- upgrade to 9.8r (RHBZ#1361436) - -* Mon Feb 29 2016 Mark McKinstry - 9.8q-3 -- fix package summary (RHBZ#1311501) - -* Fri Feb 05 2016 Fedora Release Engineering - 9.8q-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Sep 23 2015 Mark McKinstry - 9.8q-1 -- upgrade to 9.8q (RHBZ#1260817) - -* Fri Jun 19 2015 Fedora Release Engineering - 9.8p-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Mar 15 2015 Mark McKinstry - 9.8p-1 -- upgrade to 9.8p (RHBZ#1188844) - * Fri Oct 31 2014 Mark McKinstry - 9.8o-1 - upgrade to 9.8o