From b9c2d66e15226938f51eb0f3c49241e280294fc1 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 19 Feb 2024 15:52:23 +0100 Subject: [PATCH 01/14] new upstream release - 2.23 Resolves: #2264817 --- ....patch => 0100-units-2.22-no-network.patch | 0 sources | 4 +-- units-configure-c99.patch | 26 ------------------- units.spec | 10 ++++--- 4 files changed, 8 insertions(+), 32 deletions(-) rename 0001-units-2.22-no-network.patch => 0100-units-2.22-no-network.patch (100%) delete mode 100644 units-configure-c99.patch diff --git a/0001-units-2.22-no-network.patch b/0100-units-2.22-no-network.patch similarity index 100% rename from 0001-units-2.22-no-network.patch rename to 0100-units-2.22-no-network.patch diff --git a/sources b/sources index 0fd55d9..2020c73 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (units-2.22.tar.gz) = 4ed62ce6ee861b817916bc925713794187fa63eb5320e8e720558ac1d5bd48d5f1c9500e1d1f90414a6f4410f1ab806928c2a655adf4cd8b51829cd73397ab2f -SHA512 (units-2.22.tar.gz.sig) = 50a94263631d05642e56f42805711d56a54c93c73a143cdf7c18087722b5f1fff46bb8ab56abe3ca984738d8301be75ecfd2f1f9ea1917976353357a0aaad742 +SHA512 (units-2.23.tar.gz) = 628aac3a560ed728f1aba91841f9fccc0b145375a0b8953b98ac00c71bcc7f647377d16c6ba7b59e987a6e7a74b44038a62f2576f757a43d7564be469be81ee8 +SHA512 (units-2.23.tar.gz.sig) = 47fddead011bc3683033993f6e225bb580d4c86e165c7e9bcaba5eef88498992166ec206cc86f96cb1a62271513d715cdf62503fa4c08bbf943d6f60f8f792f9 diff --git a/units-configure-c99.patch b/units-configure-c99.patch deleted file mode 100644 index 69ce068..0000000 --- a/units-configure-c99.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configure b/configure -index 22c75a6222b06f68..43461d54e59f1568 100755 ---- a/configure -+++ b/configure -@@ -3881,7 +3881,7 @@ else - int - main () - { --wchar_t *out;char *in;char *res; -+wchar_t *out;char *in;const char *res; - res=setlocale(LC_CTYPE,"");res=in; - mbsrtowcs(out, &res, 2, NULL); - wcswidth(out,2); -diff --git a/configure.ac b/configure.ac -index c728d5c15d16ab2e..cd39f96e39f7d587 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -121,7 +121,7 @@ AC_CACHE_CHECK([for locale and UTF-8 support], am_cv_utf8, - #include - #include - #include --], [wchar_t *out;char *in;char *res; -+], [wchar_t *out;char *in;const char *res; - res=setlocale(LC_CTYPE,"");res=in; - mbsrtowcs(out, &res, 2, NULL); - wcswidth(out,2);], diff --git a/units.spec b/units.spec index 729bda1..996af7e 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units -Version: 2.22 -Release: 8%{?dist} +Version: 2.23 +Release: 1%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -13,8 +13,7 @@ BuildRequires: python3-devel BuildRequires: readline-devel # do not update currency.units from network during build -Patch1: 0001-units-2.22-no-network.patch -Patch2: units-configure-c99.patch +Patch100: 0100-units-2.22-no-network.patch %description Units converts an amount from one unit to another, or tells you what @@ -53,6 +52,9 @@ make check %{_mandir}/man1/* %changelog +* Mon Feb 19 2024 Jan Macku - 2.23-1 +- new upstream release + * Sat Jan 27 2024 Fedora Release Engineering - 2.22-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7d83a93b9fa7872efb35a7e11d11439498f8d1a4 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 11 Apr 2024 16:18:40 +0200 Subject: [PATCH 02/14] make less a default pager to avoid error about missing /usr/bin/pager Resolves: #2268395 --- 0101-fix-make-less-default-pager.patch | 26 ++++++++++++++++++++++++++ units.spec | 11 ++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0101-fix-make-less-default-pager.patch diff --git a/0101-fix-make-less-default-pager.patch b/0101-fix-make-less-default-pager.patch new file mode 100644 index 0000000..574a06d --- /dev/null +++ b/0101-fix-make-less-default-pager.patch @@ -0,0 +1,26 @@ +From 413f9f5563ec85756ff1a35276e1c4833d15713e Mon Sep 17 00:00:00 2001 +From: Jan Macku +Date: Thu, 11 Apr 2024 16:10:28 +0200 +Subject: [PATCH] fix: make less default pager + +Resolves: #2268395 +--- + units.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units.c b/units.c +index 469a82b..8b7dd78 100644 +--- a/units.c ++++ b/units.c +@@ -130,7 +130,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 */ + #endif + #define DEFAULTLOCALE "en_US" /* Default locale */ + #define MAXINCLUDE 5 /* Max depth of include files */ +-- +2.44.0 + diff --git a/units.spec b/units.spec index 996af7e..14a9f6b 100644 --- a/units.spec +++ b/units.spec @@ -1,10 +1,13 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.23 -Release: 1%{?dist} +Release: 2%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later + +Requires: less + BuildRequires: bison BuildRequires: gcc BuildRequires: make @@ -15,6 +18,9 @@ BuildRequires: readline-devel # do not update currency.units from network during build Patch100: 0100-units-2.22-no-network.patch +# make less a default pager to avoid error about missing /usr/bin/pager +Patch101: 0101-fix-make-less-default-pager.patch + %description Units converts an amount from one unit to another, or tells you what mathematical operation you need to perform to convert from one unit to @@ -52,6 +58,9 @@ make check %{_mandir}/man1/* %changelog +* Thu Apr 11 2024 Jan Macku - 2.23-2 +- fix make less the default pager (#2268395) + * Mon Feb 19 2024 Jan Macku - 2.23-1 - new upstream release From 6d2225324d4fb84984a869ea93deb9a663d2f4b7 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 11 Apr 2024 16:18:40 +0200 Subject: [PATCH 03/14] make less a default pager to avoid error about missing /usr/bin/pager Resolves: #2268395 --- 0101-fix-make-less-default-pager.patch | 26 ++++++++++++++++++++++++++ units.spec | 11 ++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0101-fix-make-less-default-pager.patch diff --git a/0101-fix-make-less-default-pager.patch b/0101-fix-make-less-default-pager.patch new file mode 100644 index 0000000..574a06d --- /dev/null +++ b/0101-fix-make-less-default-pager.patch @@ -0,0 +1,26 @@ +From 413f9f5563ec85756ff1a35276e1c4833d15713e Mon Sep 17 00:00:00 2001 +From: Jan Macku +Date: Thu, 11 Apr 2024 16:10:28 +0200 +Subject: [PATCH] fix: make less default pager + +Resolves: #2268395 +--- + units.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units.c b/units.c +index 469a82b..8b7dd78 100644 +--- a/units.c ++++ b/units.c +@@ -130,7 +130,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 */ + #endif + #define DEFAULTLOCALE "en_US" /* Default locale */ + #define MAXINCLUDE 5 /* Max depth of include files */ +-- +2.44.0 + diff --git a/units.spec b/units.spec index 729bda1..599457a 100644 --- a/units.spec +++ b/units.spec @@ -1,10 +1,13 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.22 -Release: 8%{?dist} +Release: 9%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later + +Requires: less + BuildRequires: bison BuildRequires: gcc BuildRequires: make @@ -16,6 +19,9 @@ BuildRequires: readline-devel Patch1: 0001-units-2.22-no-network.patch Patch2: units-configure-c99.patch +# make less a default pager to avoid error about missing /usr/bin/pager +Patch101: 0101-fix-make-less-default-pager.patch + %description Units converts an amount from one unit to another, or tells you what mathematical operation you need to perform to convert from one unit to @@ -53,6 +59,9 @@ make check %{_mandir}/man1/* %changelog +* Thu Apr 11 2024 Jan Macku - 2.22-9 +- fix make less the default pager (#2268395) + * Sat Jan 27 2024 Fedora Release Engineering - 2.22-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 412cd5dc88cf29f177328d9e2e97fbb0fe8814b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:17:15 +0000 Subject: [PATCH 04/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- units.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/units.spec b/units.spec index 14a9f6b..2d9f88f 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.23 -Release: 2%{?dist} +Release: 3%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -58,6 +58,9 @@ make check %{_mandir}/man1/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Apr 11 2024 Jan Macku - 2.23-2 - fix make less the default pager (#2268395) From 6e31795663e8c7b20ea0bd01d50e862d8544755a Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 29 Nov 2024 13:03:48 +0100 Subject: [PATCH 05/14] new upstream release - 2.24 Resolves: #2328816 --- .gitignore | 1 + sources | 4 ++-- units.spec | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 78bb7c3..b916051 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /units-*.tar.gz /units-*.tar.gz.sig +/units-*/ diff --git a/sources b/sources index 2020c73..5152430 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (units-2.23.tar.gz) = 628aac3a560ed728f1aba91841f9fccc0b145375a0b8953b98ac00c71bcc7f647377d16c6ba7b59e987a6e7a74b44038a62f2576f757a43d7564be469be81ee8 -SHA512 (units-2.23.tar.gz.sig) = 47fddead011bc3683033993f6e225bb580d4c86e165c7e9bcaba5eef88498992166ec206cc86f96cb1a62271513d715cdf62503fa4c08bbf943d6f60f8f792f9 +SHA512 (units-2.24.tar.gz) = cf0a5f3ad410ff3eeaabfac71f5570b1eed9014c0a76afb6e6f3059b5eb3184cb577f9f76b1c5acd3a1aa8beb12ad060af5af00eef8361d68a7a19697486540f +SHA512 (units-2.24.tar.gz.sig) = 1f63f46e6a073046f7e53d88d07145271a70735e6dfc2a599dbbbbb938ec880cab1abcf2340f0ec2eb4c14b8d2159220ed7d2528972536472b74aba8895978ff diff --git a/units.spec b/units.spec index 2d9f88f..04c6b48 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units -Version: 2.23 -Release: 3%{?dist} +Version: 2.24 +Release: 1%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -58,6 +58,9 @@ make check %{_mandir}/man1/* %changelog +* Fri Nov 29 2024 Jan Macku - 2.24-1 +- new upstream release + * Sat Jul 20 2024 Fedora Release Engineering - 2.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ea473973f786479b8d1963eca3381f34b3fa0f03 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:47:07 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- units.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/units.spec b/units.spec index 04c6b48..f7625b9 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.24 -Release: 1%{?dist} +Release: 2%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -58,6 +58,9 @@ make check %{_mandir}/man1/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 29 2024 Jan Macku - 2.24-1 - new upstream release From 5613aa6db572d8280686e59a1e197521b7c85b12 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 20 Feb 2025 13:18:51 +0100 Subject: [PATCH 07/14] Use C17 standard to avoid compilation errors We will revert this change once the upstream adopts the latest C standard Resolves: #2341484 --- units.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/units.spec b/units.spec index f7625b9..54c6fa0 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.24 -Release: 2%{?dist} +Release: 3%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -31,7 +31,9 @@ well as conversions such as Fahrenheit to Celsius. %autosetup -p1 %build -%configure +# Use C17 standard to avoid compilation errors +# We will revert this change once the upstream adopts the latest C standard +%configure CFLAGS="$RPM_OPT_FLAGS -std=c17" %make_build %install @@ -58,6 +60,9 @@ make check %{_mandir}/man1/* %changelog +* Thu Feb 20 2025 Jan Macku - 2.24-3 +- Use C17 standard to avoid compilation errors (#2341484) + * Sun Jan 19 2025 Fedora Release Engineering - 2.24-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3b7b2934cf93d08adb2514c27e2ba59e13fa0c6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:47:45 +0000 Subject: [PATCH 08/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- units.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/units.spec b/units.spec index 54c6fa0..b6e38aa 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.24 -Release: 3%{?dist} +Release: 4%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -60,6 +60,9 @@ make check %{_mandir}/man1/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 20 2025 Jan Macku - 2.24-3 - Use C17 standard to avoid compilation errors (#2341484) From 31570362fb7571ad67b4051fcf72a66691a3dd1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:37:07 +0000 Subject: [PATCH 09/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- units.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/units.spec b/units.spec index b6e38aa..89e01df 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.24 -Release: 4%{?dist} +Release: 5%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -60,6 +60,9 @@ make check %{_mandir}/man1/* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.24-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f3876f95fcf5ab94baa00eec6a42f631d9f73a08 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 19 Jan 2026 09:43:58 +0100 Subject: [PATCH 10/14] new upstream release - 2.25 Resolves: #2430584 --- sources | 4 ++-- units.spec | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 5152430..1f3fb0a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (units-2.24.tar.gz) = cf0a5f3ad410ff3eeaabfac71f5570b1eed9014c0a76afb6e6f3059b5eb3184cb577f9f76b1c5acd3a1aa8beb12ad060af5af00eef8361d68a7a19697486540f -SHA512 (units-2.24.tar.gz.sig) = 1f63f46e6a073046f7e53d88d07145271a70735e6dfc2a599dbbbbb938ec880cab1abcf2340f0ec2eb4c14b8d2159220ed7d2528972536472b74aba8895978ff +SHA512 (units-2.25.tar.gz) = 0483e149936d56378b384bf399e5083ea9824c8bbf177426509a7ca90127774ebb509d9ec497acfdbebb785d85ddee15215276d53bc955ff7a196401e12c7578 +SHA512 (units-2.25.tar.gz.sig) = 55423b2c4950d78238b644cb5365dea665cffba23006bb9e59acbae2c8be1c9c9d92a77e9e3e8e0a2f7091e7b22807eb63900e284e885bd642c413143911c63a diff --git a/units.spec b/units.spec index 89e01df..23f6876 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units -Version: 2.24 -Release: 5%{?dist} +Version: 2.25 +Release: 1%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPL-3.0-or-later @@ -60,6 +60,9 @@ make check %{_mandir}/man1/* %changelog +* Mon Jan 19 2026 Jan Macku - 2.25-1 +- new upstream release + * Sat Jan 17 2026 Fedora Release Engineering - 2.24-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 4c08e65ac55914b6f143fafbe3f45ff23bec2197 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Mon, 2 Mar 2026 10:31:21 +0100 Subject: [PATCH 11/14] new upstream release - 2.26 Resolves: #2443175 --- 0101-fix-make-less-default-pager.patch | 12 ++++++------ sources | 4 ++-- units.spec | 5 ++++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/0101-fix-make-less-default-pager.patch b/0101-fix-make-less-default-pager.patch index 574a06d..6f2599f 100644 --- a/0101-fix-make-less-default-pager.patch +++ b/0101-fix-make-less-default-pager.patch @@ -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 -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 diff --git a/sources b/sources index 1f3fb0a..54a0df7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (units-2.25.tar.gz) = 0483e149936d56378b384bf399e5083ea9824c8bbf177426509a7ca90127774ebb509d9ec497acfdbebb785d85ddee15215276d53bc955ff7a196401e12c7578 -SHA512 (units-2.25.tar.gz.sig) = 55423b2c4950d78238b644cb5365dea665cffba23006bb9e59acbae2c8be1c9c9d92a77e9e3e8e0a2f7091e7b22807eb63900e284e885bd642c413143911c63a +SHA512 (units-2.26.tar.gz) = aa62bfefca52a4aad61e4c907df31e0418cdb9d2e0c7a8351c66451515408f65a9c93e36a4a110fe4ce7080e5bdd8cadeff853df43dc620b80afeb652e9ecfba +SHA512 (units-2.26.tar.gz.sig) = ce3ae1a5f64ab9c5284c9d7b2a6737caffd880dbbde8acf8e45030a6f17521e304ee85ce761510ae2e87a15231cb518d6adf57aad8342228396a6a3bc71695f0 diff --git a/units.spec b/units.spec index 23f6876..228ffbe 100644 --- a/units.spec +++ b/units.spec @@ -1,6 +1,6 @@ Summary: A utility for converting amounts from one unit to another Name: units -Version: 2.25 +Version: 2.26 Release: 1%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html @@ -60,6 +60,9 @@ make check %{_mandir}/man1/* %changelog +* Mon Mar 02 2026 Jan Macku - 2.26-1 +- new upstream release + * Mon Jan 19 2026 Jan Macku - 2.25-1 - new upstream release From 4d6566ec337b7a582769e668eacbcd0b5b018c3b Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 8 Apr 2026 14:01:06 +0200 Subject: [PATCH 12/14] new upstream release - 2.27 Resolves: #2454176 --- sources | 4 ++-- units.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 54a0df7..c90157e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (units-2.26.tar.gz) = aa62bfefca52a4aad61e4c907df31e0418cdb9d2e0c7a8351c66451515408f65a9c93e36a4a110fe4ce7080e5bdd8cadeff853df43dc620b80afeb652e9ecfba -SHA512 (units-2.26.tar.gz.sig) = ce3ae1a5f64ab9c5284c9d7b2a6737caffd880dbbde8acf8e45030a6f17521e304ee85ce761510ae2e87a15231cb518d6adf57aad8342228396a6a3bc71695f0 +SHA512 (units-2.27.tar.gz.sig) = 6696986c3f40bdbef7a1a761c5314b6cce836c862aaae5926ab40da9516e5bf1d37293bcfc82bd01b92d54125b35d8e426d1b4368c7afef938b4ebf1c3723ee2 +SHA512 (units-2.27.tar.gz) = 432633abb10c68910d658e7ce50b23c26100566c2e9fc377e963f0d86d60b5366e12519c33b947805d447b7cbbb891578a8e1f7f2120aa8f95c3e9fbab60e881 diff --git a/units.spec b/units.spec index 228ffbe..826f6eb 100644 --- a/units.spec +++ b/units.spec @@ -1,6 +1,6 @@ Summary: A utility for converting amounts from one unit to another Name: units -Version: 2.26 +Version: 2.27 Release: 1%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html @@ -60,6 +60,9 @@ make check %{_mandir}/man1/* %changelog +* Wed Apr 08 2026 Jan Macku - 2.27-1 +- new upstream release + * Mon Mar 02 2026 Jan Macku - 2.26-1 - new upstream release From 0e9eaf4f5d1865099b0b91f1b9ed477b0df92264 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Tue, 21 Apr 2026 11:14:45 +0200 Subject: [PATCH 13/14] fix units compatibility with Image Mode --- units.spec | 35 +++++++++++++++++++++++++++++++---- units.tmpfiles.conf | 5 +++++ 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 units.tmpfiles.conf diff --git a/units.spec b/units.spec index 826f6eb..99ce0a7 100644 --- a/units.spec +++ b/units.spec @@ -1,14 +1,16 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.27 -Release: 1%{?dist} +Release: 2%{?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,14 @@ make check %{_bindir}/units %{_bindir}/units_cur %{_datadir}/units -%{_sharedstatedir}/units +%{_tmpfilesdir}/units.conf %{_infodir}/* %{_mandir}/man1/* %changelog +* Tue Apr 21 2026 Jan Macku - 2.27-2 +- fix units compatibility with Image Mode + * Wed Apr 08 2026 Jan Macku - 2.27-1 - new upstream release diff --git a/units.tmpfiles.conf b/units.tmpfiles.conf new file mode 100644 index 0000000..f32b17a --- /dev/null +++ b/units.tmpfiles.conf @@ -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 From e5620c32da1869d1d789e0fe7adfe1aa3c74d878 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:11:48 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- units.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/units.spec b/units.spec index 99ce0a7..14f864d 100644 --- a/units.spec +++ b/units.spec @@ -1,7 +1,7 @@ Summary: A utility for converting amounts from one unit to another Name: units Version: 2.27 -Release: 2%{?dist} +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 @@ -84,6 +84,9 @@ make check %{_mandir}/man1/* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Apr 21 2026 Jan Macku - 2.27-2 - fix units compatibility with Image Mode