Update to 1.5.0 (rhbz#2020903)

- Switch (as per upstream) to non template unit file

.gitignore

@@ -13,18 +13,3 @@
 /wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz
 /wmbusmeters-1.4.1.tar.gz
 /wmbusmeters-1.5.0.tar.gz
-/wmbusmeters-1.6.0.tar.gz
-/wmbusmeters-1.8.0.tar.gz
-/wmbusmeters-1.9.0.tar.gz
-/wmbusmeters-1.10.1.tar.gz
-/wmbusmeters-1.11.0.tar.gz
-/wmbusmeters-1.12.0.tar.gz
-/wmbusmeters-1.13.0.tar.gz
-/wmbusmeters-1.14.0.tar.gz
-/wmbusmeters-1.16.1.tar.gz
-/wmbusmeters-1.17.1.tar.gz
-/wmbusmeters-1.18.0.tar.gz
-/wmbusmeters-1.19.0.tar.gz
-/wmbusmeters-1.20.0.tar.gz
-/wmbusmeters-2.0.0.tar.gz
-/wmbusmeters-3.0.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (wmbusmeters-3.0.0.tar.gz) = 5ba9eaa132c5bfe23faa901d481af1ff84b9ce222434b489dfe205d6532370818606d461d1d51ede1fc58423086a54690151a51adc4eb0db74d5156a91d7d9e1
+SHA512 (wmbusmeters-1.5.0.tar.gz) = f678509fb50bf91b7780a4648eadfb2c049d0e1d36b5ebbe8517dbd8a880886f788464ea7904ac5cf08c07cd124b6fb8935c52f0481747e8d8a976a66a5522b7

wmbusmeters-Fix-compilation-error-on-gcc-12.patch

@@ -1,31 +0,0 @@
-From e74ab687e5d424dfbb498373dd7e086f098ac203 Mon Sep 17 00:00:00 2001
-From: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
-Date: Mon, 25 Jul 2022 18:17:02 +0200
-Subject: [PATCH] Fix compilation error on gcc 12
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes the following error:
-  src/util.cc: In function ‘bool enableLogfile(std::string, bool)’:
-  src/util.cc:379:22: error: ‘time’ was not declared in this scope; did you mean ‘utimes’?
-    379 |         time_t now = time(NULL);
-        |                      ^~~~
-
-Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
----
- src/util.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util.cc b/src/util.cc
-index d1d16c23..2d57602a 100644
---- a/src/util.cc
-+++ b/src/util.cc
-@@ -31,6 +31,7 @@
- #include<stddef.h>
- #include<string.h>
- #include<string>
-+#include<time.h>
- #include<errno.h>
- #include<sys/stat.h>
- #include<sys/time.h>

wmbusmeters.service

@@ -7,7 +7,7 @@ After=network.target
 [Service]
 Type=forking
 ExecStartPre=/bin/mkdir -p /run/wmbusmeters
-ExecStart=/usr/bin/wmbusmetersd /run/wmbusmeters/wmbusmeters.pid
+ExecStart=/usr/sbin/wmbusmetersd /run/wmbusmeters/wmbusmeters.pid
 PIDFile=/run/wmbusmeters/wmbusmeters.pid
 
 [Install]

wmbusmeters.spec

@@ -4,7 +4,7 @@ Name:                  wmbusmeters
 %global forgeurl       https://github.com/weetmuts/%{name}
 
 %if %{with_tag}
-%global tag            3.0.0
+%global tag            1.5.0
 Version:               %{tag}
 %else
 %global date           20210813
@@ -16,7 +16,7 @@ Version:               1.4.0
 
 Release:               1%{?dist}
 Summary:               Read the wireless mbus protocol to acquire utility meter readings
-License:               GPL-3.0-or-later
+License:               GPLv3+
 Url:                   %{forgeurl}
 Source0:               %{forgesource}
 # Default configuration file
@@ -29,12 +29,11 @@ BuildRequires:         /usr/bin/git
 BuildRequires:         /usr/bin/make
 BuildRequires:         gcc-c++
 BuildRequires:         systemd-rpm-macros
-BuildRequires:         pkgconfig(ncurses)
-BuildRequires:         pkgconfig(librtlsdr)
-BuildRequires:         pkgconfig(libusb-1.0)
-BuildRequires:         pkgconfig(libxml-2.0)
+BuildRequires:         ncurses-devel
+BuildRequires:         rtl-sdr-devel
+BuildRequires:         libusbx-devel
 
-Requires:              rtl-wmbus >= 0-18
+Requires:              /usr/bin/rtl_wmbus
 
 
 %description
@@ -46,11 +45,6 @@ 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
-%configure
 
 
 %build
@@ -86,10 +80,10 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
 %files
 %license LICENSE
-%doc README.md CHANGES
+%doc README.md CHANGES HowToAddaNewMeter.txt
 %dir %{_sysconfdir}/%{name}.d/
 %config(noreplace) %{_sysconfdir}/%{name}.conf
-%{_bindir}/wmbusmetersd
+%{_sbindir}/wmbusmetersd
 %{_bindir}/%{name}
 %{_unitdir}/%{name}.service
 %{_mandir}/man1/%{name}*
@@ -107,100 +101,6 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
 
 %changelog
-* Thu Aug 06 2026 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 3.0.0-1
-- Update to 3.0.0 (rhbz#2490161)
-
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Mon Mar 02 2026 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 2.0.0-1
-- Update to 2.0.0 (rhbz#2443681)
-
-* Tue Feb 03 2026 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.20.0-1
-- Update to 1.20.0 (rhbz#2433637)
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Wed May 21 2025 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.19.0-1
-- Update to 1.19.0 (rhbz#2354241)
-
-* Tue Jan 21 2025 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.18.0-3
-- Fix FTBFS on F42.
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Dec 05 2024 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.18.0-1
-- Update to 1.18.0 (rhbz#2329228)
-
-* Mon Oct 07 2024 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.17.1-2
-- Rebuilt for updated license tag
-
-* Thu Sep 12 2024 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.17.1-1
-- Update to 1.17.1 (rhbz#2307772)
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Apr 05 2024 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.16.1-2
-- Rebuild for rtl-sdr-2.0 (rhbz#2273601)
-
-* Fri Feb 23 2024 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 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 <releng@fedoraproject.org> - 1.14.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 07 2023 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.14.0-1
-- Update to 1.14.0 (rhbz#2219146)
-
-* Mon May 08 2023 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.13.0-1
-- Update to 1.13.0 (rhbz#2196040)
-
-* Mon Mar 13 2023 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.12.0-1
-- Update to 1.12.0 (rhbz#2177567)
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jan 13 2023 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.11.0-1
-- Update to 1.11.0 (rhbz#2156910)
-
-* Fri Dec 09 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.10.1-1
-- Update to 1.10.1 (rhbz#2151407)
-
-* Wed Sep 14 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.9.0-1
-- Update to 1.9.0 (rhbz#2124324)
-- Drop patch merged upstream
-
-* Tue Jul 26 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.8.0-4
-- Fix FTBFS on F37
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 27 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.8.0-2
-- Update to 1.8.0 (rhbz#2101195)
-- Update change log
-
-* Mon Jun 27 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.8.0-1
-- Update to 1.7.0 (rhbz#2101195)
-
-* Wed Apr 06 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.7.0-1
-- Update to 1.7.0 (rhbz#2069461)
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 04 2022 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.6.0-1
-- Update to 1.6.0 (rhbz#2020903)
-
 * Tue Nov 09 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.5.0-1
 - Update to 1.5.0 (rhbz#2020903)
 
@@ -213,22 +113,11 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 * Thu Aug 12 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.4.0-1
 - Update to 1.4.0 (#1991762)
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Mon May 31 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.3.0-1
 - Update to 1.3.0 (#1936290)
 
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.1.0-6
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Mon Feb 22 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.1.0-5
+* Mon Feb 22 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.1.0-2
 - Update to 1.1.0 (#1922583),
-- Remove duplicate BR for make.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Tue Dec 22 2020 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.0.4-2
 - Switch (as per upstream) to non template unit file