Update to 1.16.1 (rhbz#2264357)

- Switch to use pkgconfig for BuildRequires - Specify Require for rtl-wmbus which supports needed -f option Signed-off-by: Damian Wrobel <dwrobel@ertelnet.rybnik.pl>
2024-02-27 17:14:29 +01:00
4 changed files with 6 additions and 59 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,9 +22,3 @@
 /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
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (wmbusmeters-3.0.0.tar.gz) = 5ba9eaa132c5bfe23faa901d481af1ff84b9ce222434b489dfe205d6532370818606d461d1d51ede1fc58423086a54690151a51adc4eb0db74d5156a91d7d9e1
+SHA512 (wmbusmeters-1.16.1.tar.gz) = fff0acce9308688cd5bef2e049cbcbc5adbbd3feecd4bf0e1186712060101d8796eb6966532829eb38f14db09902f4e5ecfd560ab66e9c77db7e1b099246680b
--- a/wmbusmeters.service
+++ b/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]
--- a/wmbusmeters.spec
+++ b/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.16.1
 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
@ -46,11 +46,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 +81,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,48 +102,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