Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5620c32da | ||
|
|
0e9eaf4f5d | ||
|
|
4d6566ec33 | ||
|
|
4c08e65ac5 |
4 changed files with 54 additions and 13 deletions
|
|
@ -1,6 +1,6 @@
|
|||
From 413f9f5563ec85756ff1a35276e1c4833d15713e Mon Sep 17 00:00:00 2001
|
||||
From f9e58208af29f62cec46a583039110876fbd5f3e Mon Sep 17 00:00:00 2001
|
||||
From: Jan Macku <jamacku@redhat.com>
|
||||
Date: Thu, 11 Apr 2024 16:10:28 +0200
|
||||
Date: Mon, 2 Mar 2026 10:23:17 +0100
|
||||
Subject: [PATCH] fix: make less default pager
|
||||
|
||||
Resolves: #2268395
|
||||
|
|
@ -9,18 +9,18 @@ Resolves: #2268395
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/units.c b/units.c
|
||||
index 469a82b..8b7dd78 100644
|
||||
index 2bc1a02..fd138c5 100644
|
||||
--- a/units.c
|
||||
+++ b/units.c
|
||||
@@ -130,7 +130,7 @@ under the terms of the GNU General Public License."
|
||||
@@ -137,7 +137,7 @@ under the terms of the GNU General Public License."
|
||||
#ifdef _WIN32
|
||||
# define DEFAULTPAGER "more" /* Default pager for Windows */
|
||||
#else
|
||||
-# define DEFAULTPAGER "/usr/bin/pager" /* Default pager for Unix */
|
||||
+# define DEFAULTPAGER "/usr/bin/less" /* Default pager for Unix */
|
||||
+# define DEFAULTPAGER "/usr/bin/less" /* Default pager for Unix */
|
||||
#endif
|
||||
#define DEFAULTLOCALE "en_US" /* Default locale */
|
||||
#define MAXINCLUDE 5 /* Max depth of include files */
|
||||
--
|
||||
2.44.0
|
||||
2.53.0
|
||||
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (units-2.25.tar.gz) = 0483e149936d56378b384bf399e5083ea9824c8bbf177426509a7ca90127774ebb509d9ec497acfdbebb785d85ddee15215276d53bc955ff7a196401e12c7578
|
||||
SHA512 (units-2.25.tar.gz.sig) = 55423b2c4950d78238b644cb5365dea665cffba23006bb9e59acbae2c8be1c9c9d92a77e9e3e8e0a2f7091e7b22807eb63900e284e885bd642c413143911c63a
|
||||
SHA512 (units-2.27.tar.gz.sig) = 6696986c3f40bdbef7a1a761c5314b6cce836c862aaae5926ab40da9516e5bf1d37293bcfc82bd01b92d54125b35d8e426d1b4368c7afef938b4ebf1c3723ee2
|
||||
SHA512 (units-2.27.tar.gz) = 432633abb10c68910d658e7ce50b23c26100566c2e9fc377e963f0d86d60b5366e12519c33b947805d447b7cbbb891578a8e1f7f2120aa8f95c3e9fbab60e881
|
||||
|
|
|
|||
46
units.spec
46
units.spec
|
|
@ -1,14 +1,16 @@
|
|||
Summary: A utility for converting amounts from one unit to another
|
||||
Name: units
|
||||
Version: 2.25
|
||||
Release: 1%{?dist}
|
||||
Version: 2.27
|
||||
Release: 3%{?dist}
|
||||
Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
|
||||
Source1: units.tmpfiles.conf
|
||||
URL: https://www.gnu.org/software/units/units.html
|
||||
License: GPL-3.0-or-later
|
||||
|
||||
Requires: less
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
BuildRequires: ncurses-devel
|
||||
|
|
@ -39,14 +41,36 @@ well as conversions such as Fahrenheit to Celsius.
|
|||
%install
|
||||
%make_install
|
||||
|
||||
# replace an absolute symlink by a relative symlink
|
||||
ln -fsv ../../..%{_sharedstatedir}/units/currency.units %{buildroot}%{_datadir}/units
|
||||
# Copy dynamic files to defaults directory as templates for tmpfiles.d
|
||||
mkdir -p %{buildroot}%{_datadir}/units/defaults
|
||||
for f in currency cpi metal_prices crypto; do
|
||||
cp -p %{buildroot}%{_sharedstatedir}/units/${f}.units %{buildroot}%{_datadir}/units/defaults/
|
||||
done
|
||||
|
||||
# Remove /var/lib/units from buildroot - now managed by tmpfiles.d
|
||||
rm -rf %{buildroot}%{_sharedstatedir}/units
|
||||
|
||||
# Replace absolute symlinks by relative symlinks
|
||||
for f in currency cpi metal_prices crypto; do
|
||||
ln -fsv ../../../var/lib/units/${f}.units %{buildroot}%{_datadir}/units/${f}.units
|
||||
done
|
||||
|
||||
# Install tmpfiles.d configuration for Image Mode support
|
||||
install -m0644 -D %{SOURCE1} %{buildroot}%{_tmpfilesdir}/units.conf
|
||||
|
||||
gzip %{buildroot}%{_infodir}/units.info
|
||||
|
||||
# provide a man page for units_cur as a symlink to units.1
|
||||
ln -s units.1 %{buildroot}%{_mandir}/man1/units_cur.1
|
||||
|
||||
%post
|
||||
%tmpfiles_create units.conf
|
||||
|
||||
%postun
|
||||
if [ $1 -eq 0 ]; then
|
||||
systemd-tmpfiles --purge %{_tmpfilesdir}/units.conf 2>/dev/null || :
|
||||
fi
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
|
|
@ -55,11 +79,23 @@ make check
|
|||
%{_bindir}/units
|
||||
%{_bindir}/units_cur
|
||||
%{_datadir}/units
|
||||
%{_sharedstatedir}/units
|
||||
%{_tmpfilesdir}/units.conf
|
||||
%{_infodir}/*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Tue Apr 21 2026 Jan Macku <jamacku@redhat.com> - 2.27-2
|
||||
- fix units compatibility with Image Mode
|
||||
|
||||
* Wed Apr 08 2026 Jan Macku <jamacku@redhat.com> - 2.27-1
|
||||
- new upstream release
|
||||
|
||||
* Mon Mar 02 2026 Jan Macku <jamacku@redhat.com> - 2.26-1
|
||||
- new upstream release
|
||||
|
||||
* Mon Jan 19 2026 Jan Macku <jamacku@redhat.com> - 2.25-1
|
||||
- new upstream release
|
||||
|
||||
|
|
|
|||
5
units.tmpfiles.conf
Normal file
5
units.tmpfiles.conf
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
d /var/lib/units 0755 root root - -
|
||||
C /var/lib/units/currency.units 0644 root root - /usr/share/units/defaults/currency.units
|
||||
C /var/lib/units/cpi.units 0644 root root - /usr/share/units/defaults/cpi.units
|
||||
C /var/lib/units/metal_prices.units 0644 root root - /usr/share/units/defaults/metal_prices.units
|
||||
C /var/lib/units/crypto.units 0644 root root - /usr/share/units/defaults/crypto.units
|
||||
Loading…
Add table
Add a link
Reference in a new issue