diff --git a/.gitignore b/.gitignore index 11a7ba8..ab265ab 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,13 @@ /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 diff --git a/sources b/sources index 150d194..532e775 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wmbusmeters-1.11.0.tar.gz) = 9db0509eb1a9ff7b3d9701190f588c008a727737f33dfa50f7845cca51c3986b58f845084e1e0326bdd9a205a381ec1288e983d57d066a9c4f5c67f454ee2f04 +SHA512 (wmbusmeters-3.0.0.tar.gz) = 5ba9eaa132c5bfe23faa901d481af1ff84b9ce222434b489dfe205d6532370818606d461d1d51ede1fc58423086a54690151a51adc4eb0db74d5156a91d7d9e1 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 4e45a75..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 1.11.0 +%global tag 3.0.0 Version: %{tag} %else %global date 20210813 @@ -14,9 +14,9 @@ Version: 1.4.0 %forgemeta -Release: 2%{?dist} +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 @@ -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 @@ -45,6 +46,11 @@ 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 @@ -80,12 +86,11 @@ 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 -%{_sbindir}/wmbusmetersd +%{_bindir}/wmbusmetersd %{_bindir}/%{name} -%{_bindir}/%{name}-admin %{_unitdir}/%{name}.service %{_mandir}/man1/%{name}* %ghost %{_rundir}/%{name}/ @@ -102,6 +107,65 @@ 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 + +* 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) + +* 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 + +* 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. + +* 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) + +* 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) + +* 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) + +* 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 + +* Fri Jul 07 2023 Damian Wrobel - 1.14.0-1 +- Update to 1.14.0 (rhbz#2219146) + +* Mon May 08 2023 Damian Wrobel - 1.13.0-1 +- Update to 1.13.0 (rhbz#2196040) + +* Mon Mar 13 2023 Damian Wrobel - 1.12.0-1 +- Update to 1.12.0 (rhbz#2177567) + * Sat Jan 21 2023 Fedora Release Engineering - 1.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild