Add systemd watchdog support in to unit file vdr.service

Add systemctl daemon-reload, because after every update of vdr,
  it claims about missing systemd daemon-reload, fixes (BZ#1926084)

vdr-2.4.4-RecordingInfo.patch

@@ -0,0 +1,62 @@
+diff --git a/recording.h b/recording.h
+index 6f26f2f6..718df343 100644
+--- a/recording.h
++++ b/recording.h
+@@ -41,6 +41,11 @@ enum eRecordingUsage {
+   ruCanceled = 0x8000, // the operation has been canceled, waiting for cleanup
+   };
+ 
++// workaround patch for enabling extra features in extrecmenung until vdr 2.5.2 is released
++#ifndef EPGRENAME
++#define EPGRENAME
++#endif
++
+ void RemoveDeletedRecordings(void);
+ void AssertFreeDiskSpace(int Priority = 0, bool Force = false);
+      ///< The special Priority value -1 means that we shall get rid of any
+@@ -74,8 +79,6 @@ private:
+   char *fileName;
+   cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL);
+   bool Read(FILE *f);
+-  void SetData(const char *Title, const char *ShortText, const char *Description);
+-  void SetAux(const char *Aux);
+ public:
+   cRecordingInfo(const char *FileName);
+   ~cRecordingInfo();
+@@ -93,6 +96,8 @@ public:
+   bool Write(FILE *f, const char *Prefix = "") const;
+   bool Read(void);
+   bool Write(void) const;
++  void SetData(const char *Title, const char *ShortText, const char *Description);
++  void SetAux(const char *Aux);
+   };
+ 
+ class cRecording : public cListObject {
+@@ -150,7 +155,7 @@ public:
+        ///< Returns the full path name to the recording directory, including the
+        ///< video directory and the actual '*.rec'. For disk file access use.
+   const char *Title(char Delimiter = ' ', bool NewIndicator = false, int Level = -1) const;
+-  const cRecordingInfo *Info(void) const { return info; }
++  cRecordingInfo *Info(void) const { return info; }
+   const char *PrefixFileName(char Prefix);
+   int HierarchyLevels(void) const;
+   void ResetResume(void) const;
+diff --git a/recording.c b/recording.c
+index 17467e36..a7f08a26 100644
+--- a/recording.c
++++ b/recording.c
+@@ -430,11 +430,11 @@ cRecordingInfo::~cRecordingInfo()
+ 
+ void cRecordingInfo::SetData(const char *Title, const char *ShortText, const char *Description)
+ {
+-  if (!isempty(Title))
++  if (Title)
+      ((cEvent *)event)->SetTitle(Title);
+-  if (!isempty(ShortText))
++  if (ShortText)
+      ((cEvent *)event)->SetShortText(ShortText);
+-  if (!isempty(Description))
++  if (Description)
+      ((cEvent *)event)->SetDescription(Description);
+ }
+ 

vdr.service

@@ -11,6 +11,7 @@ Type=notify
 ExecStartPre=/usr/lib/vdr/bin/vdr-check-setup
 ExecStart=/usr/sbin/runvdr
 ExecStop=-/usr/lib/vdr/bin/vdr-set-wakeup
+WatchdogSec=60
 Restart=on-failure
 RestartPreventExitStatus=2
 

vdr.spec

@@ -30,7 +30,7 @@
 
 Name:           vdr
 Version:        2.4.4
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Video Disk Recorder
 
 License:        GPLv2+
@@ -75,6 +75,8 @@ Patch10:        http://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff
 Patch11:        %{name}-2.4.0-mainmenuhooks101.patch
 # Sent upstream 2016-06-17
 Patch15:        %{name}-1.7.37-fedora-pkgconfig.patch
+# https://gitlab.com/kamel5/extrecmenung/-/raw/master/contrib/vdr-2.4.4-RecordingInfo.patch
+Patch16:        %{name}-2.4.4-RecordingInfo.patch
 Patch99:        %{name}-2.4.1-mark-obsolete-NidTid.patch
 
 BuildRequires:  gcc
@@ -201,6 +203,7 @@ sed \
 %patch10 -p1
 %patch11 -p1
 %patch15 -p1
+%patch16 -p1
 %patch99 -p1
 
 # Patch APIVERSION TO 2.4.4 to match VDRVERSION
@@ -447,6 +450,7 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
 
 %post
 %systemd_post %{name}.service
+systemctl daemon-reload
 
 %preun
 %systemd_preun %{name}.service
@@ -547,6 +551,19 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
 
 
 %changelog
+* Tue Feb 09 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.4.4-4
+- Add systemd watchdog support in to unit file vdr.service
+- Add systemctl daemon-reload, because after every update of vdr,
+  it claims about missing systemd daemon-reload, fixes (BZ#1926084)
+
+* Fri Jan 22 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.4.4-3
+- Add modified vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin
+
+* Sat Jan 16 2021 Martin Gansser <martinkg@fedoraproject.org> - 2.4.4-2
+- Add vdr-2.4.4-RecordingInfo.patch for extrecmenung plugin
+- Add mcli to sysconfig's VDR_PLUGIN_ORDER
+- Add extrecmenung to sysconfig's VDR_PLUGIN_ORDER
+
 * Wed Aug 26 2020 Martin Gansser <martinkg@fedoraproject.org> - 2.4.4-1
 - Update to 2.4.4
 - Add vdr-2.4.1-mark-obsolete-NidTid.patch

vdr.sysconfig

@@ -18,6 +18,8 @@ VDR_OPTIONS=(--lirc --vfat --shutdown=vdr-shutdown.sh)
 # present when needed by other plugins at startup/shutdown.
 #
 VDR_PLUGIN_ORDER="
+mcli
+extrecmenung
 dxr3
 softdevice
 softhddevice