From 9637bfd8edc46b6f92635adc94ef94b3a8d824f7 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 6 Sep 2022 08:34:14 +0200 Subject: [PATCH] new upstream release - 2.22 --- .gitignore | 1 + 0001-units-2.22-no-network.patch | 26 +++++++++++++++++ 0002-units-2.17-no-network.patch | 47 ------------------------------- sources | 3 +- units-2.21.tar.gz.sig | Bin 95 -> 0 bytes units.spec | 14 ++++++--- 6 files changed, 39 insertions(+), 52 deletions(-) create mode 100644 0001-units-2.22-no-network.patch delete mode 100644 0002-units-2.17-no-network.patch delete mode 100644 units-2.21.tar.gz.sig diff --git a/.gitignore b/.gitignore index e2612c2..78bb7c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /units-*.tar.gz +/units-*.tar.gz.sig diff --git a/0001-units-2.22-no-network.patch b/0001-units-2.22-no-network.patch new file mode 100644 index 0000000..6c85a81 --- /dev/null +++ b/0001-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/0002-units-2.17-no-network.patch b/0002-units-2.17-no-network.patch deleted file mode 100644 index 9eba690..0000000 --- a/0002-units-2.17-no-network.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 06a4ba00e8e4188486fa962dbccbfa1e6afe2cf2 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 | 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 - diff --git a/sources b/sources index d59bc0d..0fd55d9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (units-2.21.tar.gz) = 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 +SHA512 (units-2.22.tar.gz) = 4ed62ce6ee861b817916bc925713794187fa63eb5320e8e720558ac1d5bd48d5f1c9500e1d1f90414a6f4410f1ab806928c2a655adf4cd8b51829cd73397ab2f +SHA512 (units-2.22.tar.gz.sig) = 50a94263631d05642e56f42805711d56a54c93c73a143cdf7c18087722b5f1fff46bb8ab56abe3ca984738d8301be75ecfd2f1f9ea1917976353357a0aaad742 diff --git a/units-2.21.tar.gz.sig b/units-2.21.tar.gz.sig deleted file mode 100644 index 3fcb5eaa23810355041f02be3e1b708c4f49e47c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WSMp2k7LsH$u-~nr|U^{Uj6VOIp33&DSqQe4+bty0hoyOJ%+gg vr=Mm?@IE7tF>P)FwC>a&3|4jRPy4^b8~Sqs|yAZ;gZV%N}VY? diff --git a/units.spec b/units.spec index 02596a8..4faa6c4 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.21 -Release: 5%{?dist} +Version: 2.22 +Release: 1%{?dist} Source: https://ftp.gnu.org/gnu/units/%{name}-%{version}.tar.gz URL: https://www.gnu.org/software/units/units.html License: GPLv3+ @@ -14,7 +14,7 @@ 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 %description Units converts an amount from one unit to another, or tells you what @@ -37,6 +37,9 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT +# remove %%{buildroot} from the target of an absolute symlink +ln -fsv %{_sharedstatedir}/units/currency.units %{buildroot}%{_datadir}/units + gzip $RPM_BUILD_ROOT%{_infodir}/units.info # provide a man page for units_cur as a symlink to units.1 @@ -46,7 +49,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,6 +58,9 @@ make check %{_mandir}/man1/* %changelog +* Tue Sep 06 2022 Kamil Dudka - 2.22-1 +- new upstream release + * Sat Jul 23 2022 Fedora Release Engineering - 2.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild