diff --git a/0001-units-2.22-no-network.patch b/0001-units-2.22-no-network.patch deleted file mode 100644 index 6c85a81..0000000 --- a/0001-units-2.22-no-network.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f18e95585de3d6f94c3b64af7bcc8793063223d3 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Wed, 8 Aug 2018 18:08:34 +0200 -Subject: [PATCH] Makefile.in: do not update currency.units from network - -Builds of packages are supposed to be reproducible. ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 79baf1d..2b71aeb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -266,7 +266,7 @@ units.txt: units.1 - - doc: units.dvi units.info units.txt units.pdf UnitsMKS.pdf UnitsWin.pdf - --check: all currency-update-check -+check: all - @echo Checking units - @./units -f $(srcdir)/definitions.units \ - '(((square(kiloinch)+2.84m2) /0.5) meters^2)^(1|4)' m \ --- -2.37.2 - diff --git a/0100-units-2.22-no-network.patch b/0100-units-2.22-no-network.patch new file mode 100644 index 0000000..6c85a81 --- /dev/null +++ b/0100-units-2.22-no-network.patch @@ -0,0 +1,26 @@ +From f18e95585de3d6f94c3b64af7bcc8793063223d3 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 8 Aug 2018 18:08:34 +0200 +Subject: [PATCH] Makefile.in: do not update currency.units from network + +Builds of packages are supposed to be reproducible. +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 79baf1d..2b71aeb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -266,7 +266,7 @@ units.txt: units.1 + + doc: units.dvi units.info units.txt units.pdf UnitsMKS.pdf UnitsWin.pdf + +-check: all currency-update-check ++check: all + @echo Checking units + @./units -f $(srcdir)/definitions.units \ + '(((square(kiloinch)+2.84m2) /0.5) meters^2)^(1|4)' m \ +-- +2.37.2 + 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