From 2ff839ac1c902220912b6c9c4adc47fd8f72cb16 Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Fri, 12 Sep 2008 05:49:36 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for vdr-streamdev --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 304ac17879fbc79592c0ca8f0aa5c9c694f434ac Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Fri, 12 Sep 2008 07:26:18 +0000 Subject: [PATCH 2/4] - initial import --- .cvsignore | 1 + import.log | 1 + sources | 1 + vdr-streamdev-client.conf | 5 +++ vdr-streamdev-server.conf | 5 +++ vdr-streamdev.spec | 81 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 94 insertions(+) create mode 100644 import.log create mode 100644 vdr-streamdev-client.conf create mode 100644 vdr-streamdev-server.conf create mode 100644 vdr-streamdev.spec diff --git a/.cvsignore b/.cvsignore index e69de29..7cede56 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +vdr-streamdev-0.3.4.tgz diff --git a/import.log b/import.log new file mode 100644 index 0000000..fd84c88 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vdr-streamdev-0_3_4-2_fc9:F-9:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221204273 diff --git a/sources b/sources index e69de29..ef4d671 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dcbe6cb0974a5ff43a1b9bb22086ec64 vdr-streamdev-0.3.4.tgz diff --git a/vdr-streamdev-client.conf b/vdr-streamdev-client.conf new file mode 100644 index 0000000..ee2f68d --- /dev/null +++ b/vdr-streamdev-client.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-streamdev-client -*- sh -*- +# +# Add command line options to pass to the streamdev-client plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/vdr-streamdev-server.conf b/vdr-streamdev-server.conf new file mode 100644 index 0000000..52c11cf --- /dev/null +++ b/vdr-streamdev-server.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-streamdev-server -*- sh -*- +# +# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec new file mode 100644 index 0000000..3432887 --- /dev/null +++ b/vdr-streamdev.spec @@ -0,0 +1,81 @@ +%define pname streamdev +%define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR) +%define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) +%define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) + +Name: vdr-%{pname} +Version: 0.3.4 +Release: 2%{?dist} +Summary: Streaming plugin for VDR + +Group: Applications/Multimedia +License: GPL+ and GPLv2+ +URL: http://streamdev.vdr-developer.org +Source0: http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}.tgz +# Configuration files for plugin parameters. These are Fedora specific and not in upstream. +Source1: %{name}-server.conf +Source2: %{name}-client.conf +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: vdr-devel >= 1.3.47 + +%description +The streamdev plugin adds streaming capabilities to your VDR. + +%package server +Summary: Streaming server plugin for VDR +Group: Applications/Multimedia +Requires: vdr(abi) = %{apiver} + +%description server +Lets your VDR act as a streaming server for other clients. +This will let you watch TV or Recordings across the network. + +%package client +Summary: Streaming client plugin for VDR +Group: Applications/Multimedia +Requires: vdr(abi) = %{apiver} + +%description client +Lets your VDR in conjunction with a streamdev-server act as a streaming client. +VDR will then be able to work even without a DVB device. + +%prep +%setup -q -n %{pname}-%{version} + +%build +make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all + +%install +rm -rf $RPM_BUILD_ROOT +install -dm 755 $RPM_BUILD_ROOT%{plugindir} +install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins +install -pm 755 libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} +install -pm 755 libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} +install -Dpm 644 streamdevhosts.conf.example $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf +install -Dpm 644 %{SOURCE2} \ + $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf + +%clean +rm -rf $RPM_BUILD_ROOT + +%files server +%defattr(-,root,root,-) +%{plugindir}/libvdr-%{pname}-server.so.%{apiver} +%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf +%config(noreplace) %{configdir}/plugins/streamdevhosts.conf +%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README + +%files client +%defattr(-,root,root,-) +%{plugindir}/libvdr-%{pname}-client.so.%{apiver} +%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-client.conf +%doc CONTRIBUTORS COPYING HISTORY PROTOCOL README + +%changelog +* Sat Aug 30 2008 Felix Kaechele - 0.3.4-2 +- Incorporated fixes suggested in bug #454120 +* Fri Jul 4 2008 Felix Kaechele - 0.3.4-1 +- Initial Build From 89d3b866b13737e62e334ee9def4411d09cd9d03 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:54 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2519cfd..692cbb9 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: vdr-streamdev -# $Id$ +# $Id: Makefile,v 1.1 2008/09/12 05:49:33 huzaifas Exp $ NAME := vdr-streamdev SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f6541094c249c55cf555af80e2b3c2c6d527035e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:56:04 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 692cbb9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vdr-streamdev -# $Id: Makefile,v 1.1 2008/09/12 05:49:33 huzaifas Exp $ -NAME := vdr-streamdev -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 diff --git a/import.log b/import.log deleted file mode 100644 index fd84c88..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vdr-streamdev-0_3_4-2_fc9:F-9:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221204273