Merge pull request #4 from pbiering/add-rpm-support

Add rpm support - forgotten fixes

Author: pbiering

HISTORY

@@ -1,5 +1,8 @@
 VDR Plugin 'mcli' Revision History
 ----------------------------------
+2021-01-26: Version 0.9.5
+- pbiering add contrib directory with RPM spec and vdr-plugin config file template
+
 2021-01-25
 - pbiering cMcliDevice::SetPid: LOCK_THREAD deactivated because resulting in deadlock with osdteletext and zapping
 - pbiering honor cam-disable earlier in cMcliDevice::SetChannelDevice

README

@@ -104,14 +104,14 @@ END
 --sock-path <path>
 	path of socket directory, default: API_SOCK_NAMESPACE
 
---cam-disable (NEW)
+--cam-disable (NEW since 0.9.5)
 	reject tuning to channels which requiring CAM
 
---tuner-max <num> (NEW)
+--tuner-max <num> (NEW since 0.9.5)
 	limit maximum number of tuners to <num>
 		avoid that LCARS skin shows 8 tuners in a 3 tuner system
 
- --debugmask <mask> (NEW)
+--debugmask <mask> (NEW since 0.9.5)
 	<mask> can be hexadecimal (0x..) or decimal
 	conditionally enable debug messages
 		PIDS          0x01

contrib/vdr-mcli.spec

@@ -10,7 +10,6 @@
 
 %define rel	1
 
-
 Name:           vdr-%{pname}
 Version:        0.9.5
 %if 0%{?gitcommit:1}
@@ -97,8 +96,18 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin/
 %make_install
 popd
 
-install -Dpm 644 %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+if [ -e %{SOURCE1} ]; then
+	# use from SOURCES / local directory
+	echo "NOTICE: take default config file from SOURCES"
+	install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+elif [ -e contrib/$(basename "%{SOURCE1}") ]; then
+	# use from inside tgz (rpmbuild -tb build)
+	echo "NOTICE: take default config file from package"
+	install -Dpm 644 contrib/$(basename "%{SOURCE1}") $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+else
+	echo "ERROR: can't find default config file %{SOURCE1}"
+	exit 1
+fi
 
 %find_lang %{name} --all-name --with-man
 
@@ -119,7 +128,8 @@ install -Dpm 644 mcliheaders.h $RPM_BUILD_ROOT%{_includedir}/vdr
 
 %changelog
 * Tue Jan 26 2021 Peter Bieringer <[email protected]> - 0.9.5-1
-- Create subpackage devel
+- Update to new release
+- Use default config file from package in case of rpmbuild -tX
 
 * Sun Dec 20 2020 Peter Bieringer <[email protected]> - 0.9.4-2
 - Create subpackage devel