From f00899b3e3749a51dfae7cea1bd2095c20b45e85 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 27 Feb 2024 17:05:41 +0100 Subject: [PATCH 01/17] Update to 1.16.1 (rhbz#2264357) - Switch to use pkgconfig for BuildRequires - Specify Require for rtl-wmbus which supports needed -f option --- wmbusmeters.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index efaae8d..de46a9b 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.14.0 +%global tag 1.16.1 Version: %{tag} %else %global date 20210813 @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -29,11 +29,12 @@ BuildRequires: /usr/bin/git BuildRequires: /usr/bin/make BuildRequires: gcc-c++ BuildRequires: systemd-rpm-macros -BuildRequires: ncurses-devel -BuildRequires: rtl-sdr-devel -BuildRequires: libusbx-devel +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(librtlsdr) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(libxml-2.0) -Requires: /usr/bin/rtl_wmbus +Requires: rtl-wmbus >= 0-18 %description @@ -101,6 +102,11 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Fri Feb 23 2024 Damian Wrobel - 1.16.1-1 +- Update to 1.16.1 (rhbz#2264357) +- Switch to use pkgconfig for BuildRequires +- Specify Require for rtl-wmbus which supports needed -f option + * Sat Jan 27 2024 Fedora Release Engineering - 1.14.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 761ab10e3b9313f0f7b1b347c076b478b9d440ee Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 27 Feb 2024 17:09:41 +0100 Subject: [PATCH 02/17] Update to 1.16.1 (rhbz#2264357) - add sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 775b20e..177847a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /wmbusmeters-1.12.0.tar.gz /wmbusmeters-1.13.0.tar.gz /wmbusmeters-1.14.0.tar.gz +/wmbusmeters-1.16.1.tar.gz diff --git a/sources b/sources index db410dc..c96e57d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.14.0.tar.gz) = 61f2c258a6e9325be8d866559cff53f939265846d85a93192da5bd2ebda14360376ceb6301dbc898251e5c6d2e2ed0e3cbdccb15625504119709e1706128bb49 +SHA512 (wmbusmeters-1.16.1.tar.gz) = fff0acce9308688cd5bef2e049cbcbc5adbbd3feecd4bf0e1186712060101d8796eb6966532829eb38f14db09902f4e5ecfd560ab66e9c77db7e1b099246680b From 38890123d97cc8e768bf8cd7ce1eabf17bea62fd Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Fri, 5 Apr 2024 12:45:31 +0200 Subject: [PATCH 03/17] Rebuild for rtl-sdr-2.0 (rhbz#2273601) --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index de46a9b..56c12f2 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -102,6 +102,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Fri Apr 05 2024 Damian Wrobel - 1.16.1-2 +- Rebuild for rtl-sdr-2.0 (rhbz#2273601) + * Fri Feb 23 2024 Damian Wrobel - 1.16.1-1 - Update to 1.16.1 (rhbz#2264357) - Switch to use pkgconfig for BuildRequires From efda44696da4bcfdc69b75a9aa54170861707d42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:28:07 +0000 Subject: [PATCH 04/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 56c12f2..59c49d6 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +Release: 3%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -102,6 +102,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Apr 05 2024 Damian Wrobel - 1.16.1-2 - Rebuild for rtl-sdr-2.0 (rhbz#2273601) From ac6f5460602f61a43371882474be263b0bce8269 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Thu, 12 Sep 2024 18:40:36 +0200 Subject: [PATCH 05/17] Update to 1.17.1 (rhbz#2307772) Signed-off-by: Damian Wrobel --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 177847a..8a454e8 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /wmbusmeters-1.13.0.tar.gz /wmbusmeters-1.14.0.tar.gz /wmbusmeters-1.16.1.tar.gz +/wmbusmeters-1.17.1.tar.gz diff --git a/sources b/sources index c96e57d..9730a10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.16.1.tar.gz) = fff0acce9308688cd5bef2e049cbcbc5adbbd3feecd4bf0e1186712060101d8796eb6966532829eb38f14db09902f4e5ecfd560ab66e9c77db7e1b099246680b +SHA512 (wmbusmeters-1.17.1.tar.gz) = e8b5ac335017ad50a6e0fdf8a5fd36d844e575a5011ee3afa3ba7730b175b733a44d41dd527840b9528450fd4cec0834aea219d29c8b0d34a290c7ecbcd82a25 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 59c49d6..7f24052 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.16.1 +%global tag 1.17.1 Version: %{tag} %else %global date 20210813 @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 3%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPLv3+ Url: %{forgeurl} @@ -102,6 +102,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Thu Sep 12 2024 Damian Wrobel - 1.17.1-1 +- Update to 1.17.1 (rhbz#2307772) + * Sat Jul 20 2024 Fedora Release Engineering - 1.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f2c620653063f1027c019ebc400c34e116ceccba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 7 Oct 2024 08:52:15 +0000 Subject: [PATCH 06/17] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 If there will be no comments in two weeks, I will merge this. --- wmbusmeters.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 7f24052..a2e8d53 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -16,7 +16,7 @@ Version: 1.4.0 Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings -License: GPLv3+ +License: GPL-3.0-or-later Url: %{forgeurl} Source0: %{forgesource} # Default configuration file From 320d36602b611b24248ff26e0b8fbf6a6f8bd08d Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Mon, 7 Oct 2024 11:07:08 +0200 Subject: [PATCH 07/17] Rebuilt for updated license tag Signed-off-by: Damian Wrobel --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index a2e8d53..6feec63 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -102,6 +102,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Mon Oct 07 2024 Damian Wrobel - 1.17.1-2 +- Rebuilt for updated license tag + * Thu Sep 12 2024 Damian Wrobel - 1.17.1-1 - Update to 1.17.1 (rhbz#2307772) From 9b6e5844f03b4fa9fa55068ee04ad94f3d45aa1a Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Thu, 5 Dec 2024 17:42:36 +0100 Subject: [PATCH 08/17] Update to 1.18.0 (rhbz#2329228) Signed-off-by: Damian Wrobel --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8a454e8..f235369 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /wmbusmeters-1.14.0.tar.gz /wmbusmeters-1.16.1.tar.gz /wmbusmeters-1.17.1.tar.gz +/wmbusmeters-1.18.0.tar.gz diff --git a/sources b/sources index 9730a10..02daa11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.17.1.tar.gz) = e8b5ac335017ad50a6e0fdf8a5fd36d844e575a5011ee3afa3ba7730b175b733a44d41dd527840b9528450fd4cec0834aea219d29c8b0d34a290c7ecbcd82a25 +SHA512 (wmbusmeters-1.18.0.tar.gz) = e8834ebcf79826eaa72e877779fb662413a73f83817bf92f3e62e3b6950257811ec31ef8d2103f04630d02bcb0dd0043051c09dbba143b18f547aa4d1c427cd1 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 6feec63..d3047b6 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.17.1 +%global tag 1.18.0 Version: %{tag} %else %global date 20210813 @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -102,6 +102,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Thu Dec 05 2024 Damian Wrobel - 1.18.0-1 +- Update to 1.18.0 (rhbz#2329228) + * Mon Oct 07 2024 Damian Wrobel - 1.17.1-2 - Rebuilt for updated license tag From 23858a75205631b9a61da7755f319f8ffd9f0d56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:10:09 +0000 Subject: [PATCH 09/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index d3047b6..29f8e56 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -102,6 +102,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Dec 05 2024 Damian Wrobel - 1.18.0-1 - Update to 1.18.0 (rhbz#2329228) From 3f6b58ad6e45167b540a3255b1eb07cfdd9af91f Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 21 Jan 2025 21:26:53 +0100 Subject: [PATCH 10/17] Fix FTBFS on F42. --- wmbusmeters.service | 2 +- wmbusmeters.spec | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/wmbusmeters.service b/wmbusmeters.service index 342ec39..f585d79 100644 --- a/wmbusmeters.service +++ b/wmbusmeters.service @@ -7,7 +7,7 @@ After=network.target [Service] Type=forking ExecStartPre=/bin/mkdir -p /run/wmbusmeters -ExecStart=/usr/sbin/wmbusmetersd /run/wmbusmeters/wmbusmeters.pid +ExecStart=/usr/bin/wmbusmetersd /run/wmbusmeters/wmbusmeters.pid PIDFile=/run/wmbusmeters/wmbusmeters.pid [Install] diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 29f8e56..fe73532 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +Release: 3%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -46,6 +46,10 @@ inserted into a database or stored in a log file. %prep %forgeautosetup -S git +# For https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin +# Unfortunately other distros does not have similar plan so we cannot +# upstream the change for now. +sed -i 's#/sbin#/bin#g' scripts/install_binaries.sh %build @@ -84,7 +88,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %doc README.md CHANGES HowToAddaNewMeter.txt %dir %{_sysconfdir}/%{name}.d/ %config(noreplace) %{_sysconfdir}/%{name}.conf -%{_sbindir}/wmbusmetersd +%{_bindir}/wmbusmetersd %{_bindir}/%{name} %{_unitdir}/%{name}.service %{_mandir}/man1/%{name}* @@ -102,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Tue Jan 21 2025 Damian Wrobel - 1.18.0-3 +- Fix FTBFS on F42. + * Sun Jan 19 2025 Fedora Release Engineering - 1.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e7c546532d988ba83795a9151a30dd52c78e34ff Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Wed, 21 May 2025 20:40:18 +0200 Subject: [PATCH 11/17] Update to 1.19.0 (rhbz#2354241) Signed-off-by: Damian Wrobel --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f235369..4694b64 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /wmbusmeters-1.16.1.tar.gz /wmbusmeters-1.17.1.tar.gz /wmbusmeters-1.18.0.tar.gz +/wmbusmeters-1.19.0.tar.gz diff --git a/sources b/sources index 02daa11..da32091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.18.0.tar.gz) = e8834ebcf79826eaa72e877779fb662413a73f83817bf92f3e62e3b6950257811ec31ef8d2103f04630d02bcb0dd0043051c09dbba143b18f547aa4d1c427cd1 +SHA512 (wmbusmeters-1.19.0.tar.gz) = b0e805d43cdb2424e13c53a537d7b702b40b87517986f0c7e0b721e546b268077a6e7a9f0a3a1658d1f54341a6f340497a7bb1581b1f26e36d8f3de3054b1944 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index fe73532..1b61a16 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.18.0 +%global tag 1.19.0 Version: %{tag} %else %global date 20210813 @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 3%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -106,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Wed May 21 2025 Damian Wrobel - 1.19.0-1 +- Update to 1.19.0 (rhbz#2354241) + * Tue Jan 21 2025 Damian Wrobel - 1.18.0-3 - Fix FTBFS on F42. From 773e5518bc69f015aa9f12893d9215bd0a893ae8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:29:51 +0000 Subject: [PATCH 12/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 1b61a16..429dbd6 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -106,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed May 21 2025 Damian Wrobel - 1.19.0-1 - Update to 1.19.0 (rhbz#2354241) From e6f71125b1d54d9e493e5cb74e4d62a0b8ef12bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:19:07 +0000 Subject: [PATCH 13/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 429dbd6..f4864f2 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +Release: 3%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -106,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.19.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 226b05fab6913ab197b887fdc2318eedb58cb5fe Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Tue, 3 Feb 2026 18:29:20 +0100 Subject: [PATCH 14/17] Update to 1.20.0 (rhbz#2433637) Signed-off-by: Damian Wrobel --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4694b64..1f0db16 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /wmbusmeters-1.17.1.tar.gz /wmbusmeters-1.18.0.tar.gz /wmbusmeters-1.19.0.tar.gz +/wmbusmeters-1.20.0.tar.gz diff --git a/sources b/sources index da32091..7fba251 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.19.0.tar.gz) = b0e805d43cdb2424e13c53a537d7b702b40b87517986f0c7e0b721e546b268077a6e7a9f0a3a1658d1f54341a6f340497a7bb1581b1f26e36d8f3de3054b1944 +SHA512 (wmbusmeters-1.20.0.tar.gz) = eba0f2ab1640e95a0249f9601fe2bb3e85caca8d5ea2b3bc233c08f77e186db00324917dd682e3a619eb946999b3a95e108ebb44561511806b4c86d75e005771 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index f4864f2..6f99fc4 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.19.0 +%global tag 1.20.0 Version: %{tag} %else %global date 20210813 @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 3%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -85,7 +85,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %files %license LICENSE -%doc README.md CHANGES HowToAddaNewMeter.txt +%doc README.md CHANGES %dir %{_sysconfdir}/%{name}.d/ %config(noreplace) %{_sysconfdir}/%{name}.conf %{_bindir}/wmbusmetersd @@ -106,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Tue Feb 03 2026 Damian Wrobel - 1.20.0-1 +- Update to 1.20.0 (rhbz#2433637) + * Sat Jan 17 2026 Fedora Release Engineering - 1.19.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 68a3b62e53c22d8f196b3238bc38c15ef00ba8a0 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Mon, 2 Mar 2026 11:42:36 +0100 Subject: [PATCH 15/17] Update to 2.0.0 (rhbz#2443681) Signed-off-by: Damian Wrobel --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1f0db16..96cd11a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /wmbusmeters-1.18.0.tar.gz /wmbusmeters-1.19.0.tar.gz /wmbusmeters-1.20.0.tar.gz +/wmbusmeters-2.0.0.tar.gz diff --git a/sources b/sources index 7fba251..c52be7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.20.0.tar.gz) = eba0f2ab1640e95a0249f9601fe2bb3e85caca8d5ea2b3bc233c08f77e186db00324917dd682e3a619eb946999b3a95e108ebb44561511806b4c86d75e005771 +SHA512 (wmbusmeters-2.0.0.tar.gz) = e80ed756f1def55ae77cff133a1fa8c7dcdb767b124804892791725c75d7d56eef551a4756bf305b05683f5eaef6ff752c752dd34d426f93347a4a2b9287f8e5 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 6f99fc4..b014325 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.20.0 +%global tag 2.0.0 Version: %{tag} %else %global date 20210813 @@ -106,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Mon Mar 02 2026 Damian Wrobel - 2.0.0-1 +- Update to 2.0.0 (rhbz#2443681) + * Tue Feb 03 2026 Damian Wrobel - 1.20.0-1 - Update to 1.20.0 (rhbz#2433637) From 545cf2ea8b46b2e68c69bfae52af5f6f9e8aef80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:52:56 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wmbusmeters.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wmbusmeters.spec b/wmbusmeters.spec index b014325..23ab6cb 100644 --- a/wmbusmeters.spec +++ b/wmbusmeters.spec @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 1%{?dist} +Release: 2%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -106,6 +106,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Mon Mar 02 2026 Damian Wrobel - 2.0.0-1 - Update to 2.0.0 (rhbz#2443681) From 1af5c15c4d4bbd0779d03d618ef88d2b07fbcd56 Mon Sep 17 00:00:00 2001 From: Damian Wrobel Date: Thu, 6 Aug 2026 21:49:13 +0200 Subject: [PATCH 17/17] Update to 3.0.0 (rhbz#2490161) Signed-off-by: Damian Wrobel --- .gitignore | 1 + sources | 2 +- wmbusmeters.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 96cd11a..ab265ab 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /wmbusmeters-1.19.0.tar.gz /wmbusmeters-1.20.0.tar.gz /wmbusmeters-2.0.0.tar.gz +/wmbusmeters-3.0.0.tar.gz diff --git a/sources b/sources index c52be7b..532e775 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-2.0.0.tar.gz) = e80ed756f1def55ae77cff133a1fa8c7dcdb767b124804892791725c75d7d56eef551a4756bf305b05683f5eaef6ff752c752dd34d426f93347a4a2b9287f8e5 +SHA512 (wmbusmeters-3.0.0.tar.gz) = 5ba9eaa132c5bfe23faa901d481af1ff84b9ce222434b489dfe205d6532370818606d461d1d51ede1fc58423086a54690151a51adc4eb0db74d5156a91d7d9e1 diff --git a/wmbusmeters.spec b/wmbusmeters.spec index 23ab6cb..ed77fa1 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 2.0.0 +%global tag 3.0.0 Version: %{tag} %else %global date 20210813 @@ -14,7 +14,7 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +Release: 1%{?dist} Summary: Read the wireless mbus protocol to acquire utility meter readings License: GPL-3.0-or-later Url: %{forgeurl} @@ -50,6 +50,7 @@ inserted into a database or stored in a log file. # Unfortunately other distros does not have similar plan so we cannot # upstream the change for now. sed -i 's#/sbin#/bin#g' scripts/install_binaries.sh +%configure %build @@ -106,6 +107,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service %changelog +* Thu Aug 06 2026 Damian Wrobel - 3.0.0-1 +- Update to 3.0.0 (rhbz#2490161) + * Fri Jul 17 2026 Fedora Release Engineering - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild