Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

vdr-plugin-mcli.changes Added

@@ -0,0 +1,33 @@
+-------------------------------------------------------------------
+Thu Oct 22 21:02:54 UTC 2014 - avvissu@yandex.ru
+
+- Fix build errors (add vdr-mcli_device.patch)
+- Fix file-contains-date-and-time
+- Removed the older macros vdr_install_plugin{_locale}
+- Spec file cleanup
+
+-------------------------------------------------------------------
+
+Fri Aug 19 00:00:00 UTC 2011 - Manfred.Tremmel@iiv.de
+
+- update to svn 186
+
+-------------------------------------------------------------------
+Sun Jan 16 00:00:00 UTC 2011 - Manfred.Tremmel@iiv.de 
+
+- update to svn 176
+
+-------------------------------------------------------------------
+Sun Jun 20 00:00:00 UTC 2010 - Manfred.Tremmel@iiv.de 
+
+- included lib and utils
+
+-------------------------------------------------------------------
+Sat Jun 19 00:00:00 UTC 2010 - Manfred.Tremmel@iiv.de 
+
+- update to svn 106
+
+-------------------------------------------------------------------
+Sat Jun 12 00:00:00 UTC 2010 - Manfred.Tremmel@iiv.de 
+
+- first packman build, svn checkout 2010-06-09

vdr-plugin-mcli.spec Changed

@@ -1,82 +1,104 @@
 #
 # spec file for package vdr-plugin-mcli
 #
-# svn co https://svn.baycom.de/repos/vdr-mcli-plugin/
-# tar cj --exclude=.svn -f vdr-mcli-plugin.tar.bz2 vdr-mcli-plugin
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+# svn co https://svn.baycom.de/repos/vdr-mcli-plugin/
+# tar cj --exclude=.svn -f vdr-mcli-plugin.tar.bz2 vdr-mcli-plugin
 
 %define pluginversion 0.9.186
 %define pluginname mcli
 %define pluginurl http://www.baycom.de
 #
 %define plugindir vdr-mcli-plugin
-%define plugintarball vdr-%pluginname-plugin.tar.bz2
+%define plugintarball vdr-%{pluginname}-plugin.tar.bz2
 #
 %define pkgversion %pluginversion
 
 Name:           vdr-plugin-mcli
-Version:        %pkgversion
+Version:        %{pkgversion}
 Release:        0
-Source:         %plugintarball
-Source1:        sysconfig.vdr-mcli
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        VDR %pluginname plugin
-License:        GPLv2+
+Summary:        VDR %{pluginname} plugin
+License:        GPL-2.0 and LGPL-2.1
 Group:          Hardware/TV
-BuildRequires:  gcc-c++ vdr-devel libxml2-devel
-PreReq:         vdr(abi) = %{vdr_apiversion}
-Url:            %pluginurl
+Url:            %{pluginurl}
+Source:         %{plugintarball}
+Source1:        sysconfig.vdr-mcli
+Patch0:         vdr-mcli-Makefile.diff
+Patch1:         vdr-mcli_device.patch
+BuildRequires:  gcc-c++
+BuildRequires:  libxml2-devel
+BuildRequires:  pkg-config
+BuildRequires:  vdr-devel
 #
 PreReq:         %fillup_prereq
-Patch0:         vdr-mcli-Makefile.diff
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         vdr(abi) = %{vdr_apiversion}
 # used to be in vdr-plugins
-Provides:       vdr-plugins:/usr/share/doc/packages/vdr/plugins/%{pluginname}
+Provides:       vdr-plugins:%{_docdir}/vdr/plugins/%{pluginname}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-%vdrname %pluginname plugin
+%{vdrname} %{pluginname} plugin
 With this plugin you can use a reel/baycom netciver in vdr.
 
 %package -n libmcli
+Summary:        Shared library %{name}
 Group:          System/Libraries
-Summary:        Shared library libmcli
 
 %description -n libmcli
-Package contains the libmcli.so shared library
+Package contains the libmcli shared library
 
 %package -n netceiver-tools
-Group:          Productivity/Multimedia/Other
 Summary:        Commandline tools for netciver management
+Group:          Productivity/Multimedia/Other
 Requires:       libmcli = %{version}-%{release}
 
 %description -n netceiver-tools
-A view commandline programms to work with the netceiver
+A view commandline programs to work with the netceiver
 * mcli         - creats dvb devices with dvbloop kernel module
 * netcvdiag    - diagnostic
 * netcvlogview - view logfiles
 * netcvupdate  - update firmware
 * netcv2dvbip  - lets netciver be used by vlc
 
-
-
-
 %prep
-%setup -q -n %plugindir
-%patch0 -p0
+%setup -q -n %{plugindir}
+%patch0
+%if 0%{?suse_version} > 1310
+%patch1 -p1
+%endif
+
+# Fix file-contains-date-and-time
+DateTime=$(date --date "`stat --format %y %{_sourcedir}/%{name}.changes`" +"%b %d %H:%M %Y")
+sed -i 's/__DATE__"\ "__TIME__/\"'"$DateTime"'\"/g' mcast/common/version.h
 
 %build
 export SUSE_ASNEEDED=0
+# Old macro -> Use "make" for modern plugins
 %vdr_make libmcli.so
 %vdr_make
 cd mcast/tool
-%{__make}
+make %{?_smp_mflags}
 cd ../client
-%{__make} mcli
+make mcli %{?_smp_mflags}
 cd ../netcv2dvbip
-%{__make}
+make %{?_smp_mflags}
 
 %install
+# Use "make install" for modern plugins
 install -d -m 755 %{buildroot}%{_libdir}
 install -m 755 mcast/client/libmcli.so %{buildroot}%{_libdir}
 install -d -m 755 %{buildroot}%{_bindir}
@@ -87,29 +109,39 @@
 install -m 755 mcast/netcv2dvbip/netcv2dvbip %{buildroot}%{_bindir}
 install -d -m 755 %{buildroot}%{vdr_sysconfdir}/plugins/mcli
 # sysconfig
-install -d -m 755 %{buildroot}/var/adm/fillup-templates
-install -m 644 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.%vdrname-mcli
-#
-%vdr_install_plugin %pluginname
-%vdr_install_plugin_locale
-#
-%find_lang vdr-%pluginname
-
-%clean
-rm -rf "${RPM_BUILD_ROOT}"
+install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{vdrname}-mcli
+# Removed the older macro vdr_install_plugin
+for i in %{pluginname}; do
+install -D -m 755 libvdr-$i.so %{buildroot}%{vdr_libdir}/libvdr-$i.so.%{vdr_apiversion}
+done 
+# Use vdr_find_locale_name macro on openSUSE > 13.1
+if [ -d locale ]; then 
+  cd locale 
+  install -d -m 755 %buildroot%{vdr_localedir} 
+  for i in *_*; do 
+	  install -d -m 755 %buildroot%{vdr_localedir}/$i/LC_MESSAGES 
+	  install -m 644 $i/LC_MESSAGES/*.mo %buildroot%{vdr_localedir}/$i/LC_MESSAGES 
+  done 
+  cd .. 
+fi
+
+%find_lang vdr-%{pluginname}
 
 %post -n libmcli -p /sbin/ldconfig
+
 %postun -n libmcli -p /sbin/ldconfig
 
 %post
-%{fillup_only -n %vdrname -s mcli}
+%{fillup_only -n %{vdrname} -s mcli}
 
-%files -f vdr-%pluginname.lang
+%files -f vdr-%{pluginname}.lang
 %defattr(-,root,root)
 %doc COPYING HISTORY README
 %{vdr_libdir}/*
+%attr(-,vdr,root) %dir %{vdr_sysconfdir}/plugins
 %attr(-,vdr,root) %dir %{vdr_sysconfdir}/plugins/mcli
-/var/adm/fillup-templates/sysconfig.%vdrname-mcli
+%{_localstatedir}/adm/fillup-templates/sysconfig.%{vdrname}-mcli
 
 %files -n libmcli
 %defattr(-,root,root)
@@ -119,15 +151,4 @@
 %defattr(-,root,root)
 %{_bindir}/*
 
-
 %changelog
-* Fri Aug 19 2011 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 0.9.186-0.pm.0
-- update to svn 186
-* Sun Jan 16 2011 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 0.9.1-2.pm.0
-- update to svn 176
-* Sun Jun 20 2010 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 0.9.1-0.pm.3
-- included lib and utils
-* Sat Jun 19 2010 Manfred Tremmel <Manfred.Tremmel@iiv.de> - 0.9.1-0.pm.2
-- update to svn 106

vdr-mcli_device.patch Added

@@ -0,0 +1,62 @@
+diff -U 3 -H -d -r -N -- vdr-mcli-plugin.orig/device.c vdr-mcli-plugin/device.c
+--- vdr-mcli-plugin.orig/device.c	2011-08-19 23:11:41.000000000 +0300
++++ vdr-mcli-plugin/device.c	2014-10-23 03:44:52.526705704 +0300
+@@ -352,7 +352,7 @@
+ 	return false;
+ }
+ 
+-bool cMcliDevice::IsTunedToTransponder (const cChannel * Channel)
++bool cMcliDevice::IsTunedToTransponder (const cChannel * Channel) const
+ {
+ 	return IsTunedToTransponderConst(Channel);
+ }
+@@ -474,7 +474,7 @@
+ 	} else {
+ 		m_disabletimeout = TEMP_DISABLE_TIMEOUT_DEFAULT;
+ 	}
+-	bool cam_force=!EITScanner.UsesDevice(this);
++	bool cam_force=true;
+ 	if(cam_force && !CheckCAM(Channel, true)) {
+ #ifdef DEBUG_TUNE
+ 		printf("No CAM on %d available even after tried to steal one\n", CardIndex () + 1);
+@@ -691,16 +691,16 @@
+ 	return true;
+ }
+ 
+-bool cMcliDevice::HasLock (int TimeoutMs)
++bool cMcliDevice::HasLock (int TimeoutMs) const
+ {
+ //      printf ("HasLock TimeoutMs:%d\n", TimeoutMs);
+ 
+ 	if ((m_ten.s.st & FE_HAS_LOCK) || !TimeoutMs) {
+ 		return m_ten.s.st & FE_HAS_LOCK;
+ 	}
+-	cMutexLock MutexLock (&mutex);
++	cMutexLock MutexLock ((cMutex*)&mutex);
+ 	if (TimeoutMs && !(m_ten.s.st & FE_HAS_LOCK)) {
+-		m_locked.TimedWait (mutex, TimeoutMs);
++		((cCondVar&)m_locked).TimedWait ((cMutex&)mutex, TimeoutMs);
+ 	}
+ 	if (m_ten.s.st & FE_HAS_LOCK) {
+ 		return true;
+diff -U 3 -H -d -r -N -- vdr-mcli-plugin.orig/device.h vdr-mcli-plugin/device.h
+--- vdr-mcli-plugin.orig/device.h	2011-08-19 23:11:41.000000000 +0300
++++ vdr-mcli-plugin/device.h	2014-10-23 03:25:04.194608691 +0300
+@@ -48,7 +48,7 @@
+       protected:
+       	cPluginMcli *m_mcli;
+ 	virtual bool SetChannelDevice (const cChannel * Channel, bool LiveView);
+-	virtual bool HasLock (int TimeoutMs);
++	virtual bool HasLock(int TimeoutMs = 0) const;
+ 	virtual bool SetPid (cPidHandle * Handle, int Type, bool On);
+ 	virtual bool OpenDvr (void);
+ 	virtual void CloseDvr (void);
+@@ -100,7 +100,7 @@
+ 	virtual bool ProvidesSource (int Source) const;
+ 	virtual bool ProvidesTransponder (const cChannel * Channel) const;
+ 	virtual bool ProvidesChannel (const cChannel * Channel, int Priority = -1, bool * NeedsDetachReceivers = NULL) const;
+-	virtual bool IsTunedToTransponder (const cChannel * Channel);
++	virtual bool IsTunedToTransponder (const cChannel * Channel) const;
+ 
+ 	virtual int HandleTsData (unsigned char *buffer, size_t len);
+ 	tra_t *GetTenData (void) {