6 changed files with 104 additions and 68 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/units-2.21.tar.gz
+SOURCES/units-2.22.tar.gz
--- a/.units.metadata
+++ b/.units.metadata
@ -1 +1 @@
-a897e639111c9400737b68ec22e5f70eaf5d7253 SOURCES/units-2.21.tar.gz
+586f71c3e51e0bed77cf7751de333c43e347f78e SOURCES/units-2.22.tar.gz
--- a/SOURCES/0001-units-2.22-no-network.patch
+++ b/SOURCES/0001-units-2.22-no-network.patch
@ -0,0 +1,26 @@
+From f18e95585de3d6f94c3b64af7bcc8793063223d3 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+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
+
--- a/SOURCES/0002-units-2.17-no-network.patch
+++ b/SOURCES/0002-units-2.17-no-network.patch
@ -1,47 +0,0 @@
-From 06a4ba00e8e4188486fa962dbccbfa1e6afe2cf2 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-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 | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 70e2e10..7c1ee5b 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -61,8 +61,6 @@ CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@
- OBJECTS = units.@OBJEXT@ parse.tab.@OBJEXT@ getopt.@OBJEXT@ getopt1.@OBJEXT@ @STRFUNC@
- 
-.PHONY: currency-units-update
-
- .SUFFIXES:
- .SUFFIXES: .c .@OBJEXT@ .rc .res .texinfo .pdf
- 
-@@ -110,7 +108,7 @@ units_cur_inst: units_cur
-             -e "s@/usr/bin/python@$(PYTHON)@" \
-              $(srcdir)/units_cur > units_cur_inst
- 
-install-support: definitions.units units_cur_inst currency-units-update
-+install-support: definitions.units units_cur_inst
- 	$(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) $(DESTDIR)@CDAT@
- 	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
- 	-rm -f $(DESTDIR)@UDAT@currency.units
-@@ -207,11 +205,6 @@ texclean:
- 	-rm -f units.log UnitsMKS.log UnitsWin.log \
- 	    *.aux *.cp *.fn *.ky *.op *.pg *.toc *.tp *.vr
- 
-currency-units-update: 
-	@echo "Trying to update currency.units (will use existing file if this fails)"
-	-$(srcdir)/units_cur currency.units
-	if [ ! -s currency.units ]; then cp $(srcdir)/currency.units currency.units;fi
-
- sig:
- 	echo units-`sed -n -e '/\#.*VERSION/s/.*"\(.*\)"/\1/gp' \
- 	    $(srcdir)/units.c`.tar.gz > distname
-- 
-2.17.1
-
--- a/SOURCES/units-configure-c99.patch
+++ b/SOURCES/units-configure-c99.patch
@ -0,0 +1,26 @@
+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 <wchar.h>
+ #include <locale.h>
+ #include <langinfo.h>
+-], [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);],
--- a/SPECS/units.spec
+++ b/SPECS/units.spec
@ -1,11 +1,10 @@
 Summary: A utility for converting amounts from one unit to another
 Name: units
-Version: 2.21
-Release: 4%{?dist}
+Version: 2.22
+Release: 9%{?dist}
 Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz
 URL: https://www.gnu.org/software/units/units.html
-License: GPLv3+
-BuildRequires: automake
+License: GPL-3.0-or-later
 BuildRequires: bison
 BuildRequires: gcc
 BuildRequires: make
@ -14,7 +13,8 @@ BuildRequires: python3-devel
 BuildRequires: readline-devel

 # do not update currency.units from network during build
-Patch2: 0002-units-2.17-no-network.patch
+Patch1: 0001-units-2.22-no-network.patch
+Patch2: units-configure-c99.patch

 %description
 Units converts an amount from one unit to another, or tells you what
@ -25,19 +25,17 @@ well as conversions such as Fahrenheit to Celsius.
 %prep
 %autosetup -p1

-# make units_cur use Python 3
-sed -e 's|^AC_PATH_PROG(PYTHON, .*$|PYTHON=%{__python3}\nAC_SUBST(PYTHON)|' \
-    -i configure.ac
-autoreconf -fiv
-
 %build
 %configure
-make %{?_smp_mflags}
+%make_build

 %install
-make install DESTDIR=$RPM_BUILD_ROOT 
+%make_install
+
+# replace an absolute symlink by a relative symlink
+ln -fsv ../../..%{_sharedstatedir}/units/currency.units %{buildroot}%{_datadir}/units

-gzip $RPM_BUILD_ROOT%{_infodir}/units.info
+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
@ -46,7 +44,7 @@ ln -s units.1 %{buildroot}%{_mandir}/man1/units_cur.1
 make check

 %files
-%doc ChangeLog COPYING NEWS README
+%doc COPYING NEWS README
 %{_bindir}/units
 %{_bindir}/units_cur
 %{_datadir}/units
@ -55,12 +53,45 @@ make check
 %{_mandir}/man1/*

 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.21-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.22-9
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.22-9
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.22-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Nov 30 2023 Florian Weimer <fweimer@redhat.com> - 2.22-7
+- C compatibility fix for the configure script (#2252276)
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.22-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Apr 13 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.22-5
+- migrate to SPDX license format
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.22-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Sep 06 2022 Kamil Dudka <kdudka@redhat.com> - 2.22-3
+- remove a build system tweak related to Python 3 no longer needed
+
+* Tue Sep 06 2022 Kamil Dudka <kdudka@redhat.com> - 2.22-2
+- replace an absolute symlink by a relative symlink
+- use %%make_build and %%make_install RPM macros
+
+* Tue Sep 06 2022 Kamil Dudka <kdudka@redhat.com> - 2.22-1
+- new upstream release
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.21-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild