From ef17606869617979ec723bc738f32d3175416555 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Mon, 22 Feb 2021 15:59:55 +0100 Subject: [PATCH 1/8] Update to 1.1.0 (#1922583) - Remove duplicate BR for make. --- wmbusmeters.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 8897de6..70df5a9 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -4,7 +4,7 @@ Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} %if %{with_tag} -%global tag 1.0.4 +%global tag 1.1.0 Version: %{tag} %else %global date 20201218 @@ -14,7 +14,7 @@ Version: 1.0.4 %forgemeta -Release: 3%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -25,7 +25,6 @@ Source1: file://%{name}.conf # Systemd service file Source2: file://%{name}.service -BuildRequires: make BuildRequires: /usr/bin/git BuildRequires: /usr/bin/make BuildRequires: gcc-c++ @@ -101,6 +100,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Mon Feb 22 2021 Damian Wrobel - 1.1.0-1 +- Update to 1.1.0 (#1922583), +- Remove duplicate BR for make. + * Wed Jan 27 2021 Fedora Release Engineering - 1.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6cb9b90278b7d0e5d84bd45c5035fb0b3e753bfa Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Mon, 22 Feb 2021 16:24:29 +0100 Subject: [PATCH 2/8] Update sources file --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 51745e9..725a1a6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /wmbusmeters-0.9.35.tar.gz /wmbusmeters-0.9.36.tar.gz /wmbusmeters-1.0.4.tar.gz +/wmbusmeters-1.1.0.tar.gz diff --git a/sources b/sources index 6460a01..32138e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.0.4.tar.gz) = c21c83bdb7d3576582c69bef06dece748dfdd63e8672b208310102a54fe186c8b07b27e3fbc54e3487d66231838bd1a65ff5970145e5443dfc5a2f09aef3d467 +SHA512 (wmbusmeters-1.1.0.tar.gz) = 43ccd55e44fbaf52c3889562094a7b8e86644ade27e459e0c5e14c145cddc0a9c6eb1d9f4b25e9a7f77c672a6b4eb16c91499d16083dc1ff001b52c369eca32d diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 70df5a9..09bf701 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.0.4 %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -100,7 +100,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog -* Mon Feb 22 2021 Damian Wrobel - 1.1.0-1 +* Mon Feb 22 2021 Damian Wrobel - 1.1.0-2 - Update to 1.1.0 (#1922583), - Remove duplicate BR for make. From e98c669a8cadb78e14259b2821dee9a3446c6b9c Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 1 Jun 2021 00:23:31 +0200 Subject: [PATCH 3/8] Update to 1.3.0 (#1936290) --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 725a1a6..d6bcb0c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /wmbusmeters-0.9.36.tar.gz /wmbusmeters-1.0.4.tar.gz /wmbusmeters-1.1.0.tar.gz +/wmbusmeters-1.3.0.tar.gz diff --git a/sources b/sources index 32138e9..bce12df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.1.0.tar.gz) = 43ccd55e44fbaf52c3889562094a7b8e86644ade27e459e0c5e14c145cddc0a9c6eb1d9f4b25e9a7f77c672a6b4eb16c91499d16083dc1ff001b52c369eca32d +SHA512 (wmbusmeters-1.3.0.tar.gz) = 682eeee0a6ef5802927377d5c6599043b547d6a5ef9590a9b443aca37c96ca1f5ccae11306332bb8eafb14d1f86755a00a7d0a9027040c9942be23b029e1b744 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 09bf701..54430ba 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -4,7 +4,7 @@ Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} %if %{with_tag} -%global tag 1.1.0 +%global tag 1.3.0 Version: %{tag} %else %global date 20201218 @@ -14,7 +14,7 @@ Version: 1.0.4 %forgemeta -Release: 2%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -54,9 +54,10 @@ inserted into a database or stored in a log file. %install +%set_build_flags %{make_install} STRIP=true COMMIT_HASH="" TAG=%{version} COMMIT=%{version} \ TAG_COMMIT=%{version} CHANGES="" \ - DESTDIR=%{buildroot} EXTRA_INSTALL_OPTIONS="--no-adduser --no-udev-rules" + DESTDIR=%{buildroot} EXTRA_INSTALL_OPTIONS="--no-adduser" # We are using journald rm -rf %{buildroot}%{_sysconfdir}/logrotate.d/ @@ -100,6 +101,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Mon May 31 2021 Damian Wrobel - 1.3.0-1 +- Update to 1.3.0 (#1936290) + * Mon Feb 22 2021 Damian Wrobel - 1.1.0-2 - Update to 1.1.0 (#1922583), - Remove duplicate BR for make. From 1f43c0e34c47235a52d3705b03b57271293a3185 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Thu, 12 Aug 2021 19:19:58 +0200 Subject: [PATCH 4/8] Update to 1.4.0 (#1991762) --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d6bcb0c..5827cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /wmbusmeters-1.0.4.tar.gz /wmbusmeters-1.1.0.tar.gz /wmbusmeters-1.3.0.tar.gz +/wmbusmeters-1.4.0.tar.gz diff --git a/sources b/sources index bce12df..04f7927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.3.0.tar.gz) = 682eeee0a6ef5802927377d5c6599043b547d6a5ef9590a9b443aca37c96ca1f5ccae11306332bb8eafb14d1f86755a00a7d0a9027040c9942be23b029e1b744 +SHA512 (wmbusmeters-1.4.0.tar.gz) = 628cb2d6a185105703ab176af2a47f24160d7a4f5f72b9148c9498801138b33d61631911d5528efc24ef8431be165f73231f8e4ae691fd2ccc18e4b64f6a8bb1 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 54430ba..0526174 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -4,12 +4,12 @@ Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} %if %{with_tag} -%global tag 1.3.0 +%global tag 1.4.0 Version: %{tag} %else -%global date 20201218 -%global commit 9c7d7dd270dec07a8e521bf5c0bef07bd318567a -Version: 1.0.4 +%global date 20210801 +%global commit 272922a2aa8864d05d47f04dc9cc8c9060bff35d +Version: 1.4.0 %endif %forgemeta @@ -101,6 +101,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Thu Aug 12 2021 Damian Wrobel - 1.4.0-1 +- Update to 1.4.0 (#1991762) + * Mon May 31 2021 Damian Wrobel - 1.3.0-1 - Update to 1.3.0 (#1936290) From 8bdd15883b204367f32dff2da3825c3640e889c4 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Fri, 13 Aug 2021 21:13:36 +0200 Subject: [PATCH 5/8] Update to the latest snapshot (fixes compilation errors) --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5827cbd..90aa49f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /wmbusmeters-1.1.0.tar.gz /wmbusmeters-1.3.0.tar.gz /wmbusmeters-1.4.0.tar.gz +/wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz diff --git a/sources b/sources index 04f7927..a38ae53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.4.0.tar.gz) = 628cb2d6a185105703ab176af2a47f24160d7a4f5f72b9148c9498801138b33d61631911d5528efc24ef8431be165f73231f8e4ae691fd2ccc18e4b64f6a8bb1 +SHA512 (wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz) = 528437cd314850da776bed568038d3fff3ccc285897455f0d3a9efefde675a2dfd1ff63a9cd9d0f7843f77307357703e297f6dad3adf8a123a2f8e386d596e60 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 0526174..b59db32 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -1,4 +1,4 @@ -%global with_tag 1 +%global with_tag 0 Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} @@ -7,8 +7,8 @@ Name: wmbusmeters %global tag 1.4.0 Version: %{tag} %else -%global date 20210801 -%global commit 272922a2aa8864d05d47f04dc9cc8c9060bff35d +%global date 20210813 +%global commit 8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988 Version: 1.4.0 %endif @@ -101,6 +101,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Fri Aug 13 2021 Damian Wrobel - 1.4.0-2 +- Update to the latest snapshot (fixes compilation errors) + * Thu Aug 12 2021 Damian Wrobel - 1.4.0-1 - Update to 1.4.0 (#1991762) From 7fb62eb6c58766c021ace4b103408466a62aad03 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 31 Aug 2021 15:44:00 +0200 Subject: [PATCH 6/8] Update to 1.4.1 --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 90aa49f..1565cbd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /wmbusmeters-1.3.0.tar.gz /wmbusmeters-1.4.0.tar.gz /wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz +/wmbusmeters-1.4.1.tar.gz diff --git a/sources b/sources index a38ae53..4f75b37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz) = 528437cd314850da776bed568038d3fff3ccc285897455f0d3a9efefde675a2dfd1ff63a9cd9d0f7843f77307357703e297f6dad3adf8a123a2f8e386d596e60 +SHA512 (wmbusmeters-1.4.1.tar.gz) = 479975824efe90cf948408c147bd982703b58d54af633e14f9d2b7582efd2cf93a1a5d05515759a5220a91ed3e22a20fb216d972c26c69275fefcd667f4892d8 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index b59db32..0882972 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -1,10 +1,10 @@ -%global with_tag 0 +%global with_tag 1 Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} %if %{with_tag} -%global tag 1.4.0 +%global tag 1.4.1 Version: %{tag} %else %global date 20210813 @@ -101,6 +101,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Tue Aug 31 2021 Damian Wrobel - 1.4.1-1 +- Update to 1.4.1 + * Fri Aug 13 2021 Damian Wrobel - 1.4.0-2 - Update to the latest snapshot (fixes compilation errors) From b224d2a1a7b71e4bcc0dfc5576a92f25b94fe764 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 9 Nov 2021 21:32:19 +0100 Subject: [PATCH 7/8] Update to 1.5.0 (rhbz#2020903) --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1565cbd..4b16b3c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /wmbusmeters-1.4.0.tar.gz /wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz /wmbusmeters-1.4.1.tar.gz +/wmbusmeters-1.5.0.tar.gz diff --git a/sources b/sources index 4f75b37..45a4209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.4.1.tar.gz) = 479975824efe90cf948408c147bd982703b58d54af633e14f9d2b7582efd2cf93a1a5d05515759a5220a91ed3e22a20fb216d972c26c69275fefcd667f4892d8 +SHA512 (wmbusmeters-1.5.0.tar.gz) = f678509fb50bf91b7780a4648eadfb2c049d0e1d36b5ebbe8517dbd8a880886f788464ea7904ac5cf08c07cd124b6fb8935c52f0481747e8d8a976a66a5522b7 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 0882972..3284646 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -4,7 +4,7 @@ Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} %if %{with_tag} -%global tag 1.4.1 +%global tag 1.5.0 Version: %{tag} %else %global date 20210813 @@ -101,6 +101,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Tue Nov 09 2021 Damian Wrobel - 1.5.0-1 +- Update to 1.5.0 (rhbz#2020903) + * Tue Aug 31 2021 Damian Wrobel - 1.4.1-1 - Update to 1.4.1 From 2f01efd9d2c83e8ef05159066e9653425a3598cc Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 4 Jan 2022 15:14:34 +0100 Subject: [PATCH 8/8] Update to 1.6.0 (rhbz#2020903) --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4b16b3c..fef8033 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz /wmbusmeters-1.4.1.tar.gz /wmbusmeters-1.5.0.tar.gz +/wmbusmeters-1.6.0.tar.gz diff --git a/sources b/sources index 45a4209..436b8a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.5.0.tar.gz) = f678509fb50bf91b7780a4648eadfb2c049d0e1d36b5ebbe8517dbd8a880886f788464ea7904ac5cf08c07cd124b6fb8935c52f0481747e8d8a976a66a5522b7 +SHA512 (wmbusmeters-1.6.0.tar.gz) = 5bdf6ca911dac69ee14b7af792432554fc70e86427b68683b68090bc6f8e63e9e7f4bcd114026f71ee8e55506c48be0494c7dbd8d645a2cbf4bcca550900307a diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 3284646..c0033e5 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -4,7 +4,7 @@ Name: wmbusmeters %global forgeurl https://github.com/weetmuts/%{name} %if %{with_tag} -%global tag 1.5.0 +%global tag 1.6.0 Version: %{tag} %else %global date 20210813 @@ -101,6 +101,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Tue Jan 04 2022 Damian Wrobel - 1.6.0-1 +- Update to 1.6.0 (rhbz#2020903) + * Tue Nov 09 2021 Damian Wrobel - 1.5.0-1 - Update to 1.5.0 (rhbz#2020903)