Update to 1.5.0 (rhbz#2020903)

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

.gitignore

@@ -4,3 +4,12 @@
 /wmbusmeters-0.9.30.tar.gz
 /wmbusmeters-0.9.31.tar.gz
 /wmbusmeters-0.9.32.tar.gz
+/wmbusmeters-0.9.35.tar.gz
+/wmbusmeters-0.9.36.tar.gz
+/wmbusmeters-1.0.4.tar.gz
+/wmbusmeters-1.1.0.tar.gz
+/wmbusmeters-1.3.0.tar.gz
+/wmbusmeters-1.4.0.tar.gz
+/wmbusmeters-8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988.tar.gz
+/wmbusmeters-1.4.1.tar.gz
+/wmbusmeters-1.5.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (wmbusmeters-0.9.32.tar.gz) = cb88ccbe7b0b2fcf3ec33d9d1a1a3bb76078237622633d467b26e3b1792e828f2e2e21789f35def054ea79b775f40c2b38c34083fb4bbbe4fcd405b0ec3a3544
+SHA512 (wmbusmeters-1.5.0.tar.gz) = f678509fb50bf91b7780a4648eadfb2c049d0e1d36b5ebbe8517dbd8a880886f788464ea7904ac5cf08c07cd124b6fb8935c52f0481747e8d8a976a66a5522b7

wmbusmeters.conf

@@ -1,4 +1,4 @@
 loglevel=debug
-device=auto
+device=auto:c1,t1
 logtelegrams=true
 format=json

wmbusmeters.service

@@ -1,5 +1,5 @@
 [Unit]
-Description="wmbusmeters service on %I"
+Description="wmbusmeters service"
 Documentation=https://github.com/weetmuts/wmbusmeters
 Documentation=man:wmbusmeters(1)
 After=network.target
@@ -7,8 +7,8 @@ After=network.target
 [Service]
 Type=forking
 ExecStartPre=/bin/mkdir -p /run/wmbusmeters
-ExecStart=/usr/sbin/wmbusmetersd --device='%I' /run/wmbusmeters/wmbusmeters-%i.pid
-PIDFile=/run/wmbusmeters/wmbusmeters-%i.pid
+ExecStart=/usr/sbin/wmbusmetersd /run/wmbusmeters/wmbusmeters.pid
+PIDFile=/run/wmbusmeters/wmbusmeters.pid
 
 [Install]
 WantedBy=multi-user.target

wmbusmeters.spec

@@ -1,14 +1,20 @@
+%global with_tag 1
+
 Name:                  wmbusmeters
-
 %global forgeurl       https://github.com/weetmuts/%{name}
-%global tag            0.9.32
-%global the_binary     rtl_wmbus
 
+%if %{with_tag}
+%global tag            1.5.0
 Version:               %{tag}
+%else
+%global date           20210813
+%global commit         8dd3e87c44ecb2e3fc46f7bc6df9ea6195c8b988
+Version:               1.4.0
+%endif
 
 %forgemeta
 
-Release:               2%{?dist}
+Release:               1%{?dist}
 Summary:               Read the wireless mbus protocol to acquire utility meter readings
 License:               GPLv3+
 Url:                   %{forgeurl}
@@ -17,12 +23,15 @@ Source0:               %{forgesource}
 # Stores all logs in journald
 Source1:               file://%{name}.conf
 # Systemd service file
-Source2:               file://%{name}@.service
+Source2:               file://%{name}.service
 
 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
 
 Requires:              /usr/bin/rtl_wmbus
 
@@ -41,13 +50,14 @@ inserted into a database or stored in a log file.
 %build
 %set_build_flags
 %{make_build} STRIP=true COMMIT_HASH="" TAG=%{version} COMMIT=%{version} \
-    TAG_COMMIT=%{version} CHANGES=""
+    TAG_COMMIT=%{version}%{distprefix} CHANGES=""
 
 
 %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/
@@ -65,7 +75,7 @@ rm -f %{buildroot}%{_unitdir}/%{name}.service
 install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}.conf
 
 # Install systemd service file
-install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}@.service
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
 
 %files
@@ -75,22 +85,55 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}@.service
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_sbindir}/wmbusmetersd
 %{_bindir}/%{name}
-%{_unitdir}/%{name}@.service
+%{_unitdir}/%{name}.service
 %{_mandir}/man1/%{name}*
 %ghost %{_rundir}/%{name}/
 
 
 %post
-%systemd_post %{name}@\*.service
+%systemd_post %{name}.service
  
 %preun
-%systemd_preun %{name}@\*.service
+%systemd_preun %{name}.service
  
 %postun
-%systemd_postun_with_restart %{name}@\*.service
+%systemd_postun_with_restart %{name}.service
 
 
 %changelog
+* Tue Nov 09 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.5.0-1
+- Update to 1.5.0 (rhbz#2020903)
+
+* Tue Aug 31 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.4.1-1
+- Update to 1.4.1
+
+* Fri Aug 13 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.4.0-2
+- Update to the latest snapshot (fixes compilation errors)
+
+* Thu Aug 12 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.4.0-1
+- Update to 1.4.0 (#1991762)
+
+* Mon May 31 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.3.0-1
+- Update to 1.3.0 (#1936290)
+
+* Mon Feb 22 2021 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.1.0-2
+- Update to 1.1.0 (#1922583),
+
+* Tue Dec 22 2020 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.0.4-2
+- Switch (as per upstream) to non template unit file
+
+* Mon Dec 07 2020 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 1.0.4-1
+- Update to the latest available version
+
+* Sat Oct 31 2020 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 0.9.36-2
+- Allows to build non-released versions
+
+* Tue Sep 08 2020 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 0.9.36-1
+- Update to the latest available version
+
+* Mon Aug 31 2020 Damian Wrobel <dwrobel@ertelnet.rybnik.pl> - 0.9.35-1
+- Update to the latest available version
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild