From 57af76eab8bbba21d70f3d714cdf94f2ef6b776c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:15:10 +0000 Subject: [PATCH 1/5] Initialize branch F-12 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..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From de7a3141725905948b7638eeec90b224aa9b65a4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:12:53 +0000 Subject: [PATCH 2/5] 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 8bc16917eab59cbc0a5cda30337144324a5fc7cc Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sat, 2 Jan 2010 17:32:06 +0000 Subject: [PATCH 3/5] - added missing BuildReq: gettext --- .cvsignore | 2 +- sources | 2 +- vdr-streamdev.spec | 28 ++++++++++++++++++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7cede56..47206c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdr-streamdev-0.3.4.tgz +vdr-streamdev-0.5.0-pre-20090706.tgz diff --git a/sources b/sources index ef4d671..9b7b612 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dcbe6cb0974a5ff43a1b9bb22086ec64 vdr-streamdev-0.3.4.tgz +4675d8cd204defad941c65b020bfb04a vdr-streamdev-0.5.0-pre-20090706.tgz diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index 97166f2..c1d3976 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -1,23 +1,25 @@ %define pname streamdev +%define prever 20090706 %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: 4%{?dist} +Version: 0.5.0 +Release: 0.2.pre%{prever}%{?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 +Source0: http://streamdev.vdr-developer.org/releases/vdr-streamdev-%{version}%{?prever:-pre-%{prever}}.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 +BuildRequires: gettext %description The streamdev plugin adds streaming capabilities to your VDR. @@ -41,10 +43,16 @@ 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} +%setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} + +for f in CONTRIBUTORS HISTORY; do + iconv -f iso8859-1 -t utf-8 $f >$f.conv + touch -r $f $f.conv + mv $f.conv $f +done %build -make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all +make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$RPM_BUILD_ROOT%{_libdir}/vdr/locale all %install rm -rf $RPM_BUILD_ROOT @@ -52,7 +60,8 @@ 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 streamdev/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf +install -Dpm 755 streamdev/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf install -Dpm 644 %{SOURCE2} \ @@ -64,6 +73,7 @@ rm -rf $RPM_BUILD_ROOT %files server %defattr(-,root,root,-) %{plugindir}/libvdr-%{pname}-server.so.%{apiver} +%{_libdir}/vdr/bin/externremux.sh %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf %config(noreplace) %{configdir}/plugins/streamdevhosts.conf %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README @@ -75,6 +85,12 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sat Jan 02 2010 Felix Kaechele - 0.5.0-0.2.pre20090706 +- added missing BuildReq: gettext + +* Fri Dec 18 2009 Felix Kaechele - 0.5.0-0.1.pre20090706 +- update to latest version + * Sun Jul 26 2009 Fedora Release Engineering - 0.3.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 84f3aa462807d2d45cd2234a83137d861a6b69d0 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Sun, 25 Jul 2010 09:04:46 +0000 Subject: [PATCH 4/5] - update to final 0.5.0 release --- .cvsignore | 2 +- sources | 2 +- vdr-streamdev.spec | 27 ++++++++++++++++----------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 47206c7..2347db0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vdr-streamdev-0.5.0-pre-20090706.tgz +vdr-streamdev-0.5.0.tgz diff --git a/sources b/sources index 9b7b612..2d1b102 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4675d8cd204defad941c65b020bfb04a vdr-streamdev-0.5.0-pre-20090706.tgz +2dd785198e3ed25515c347fcd5261a21 vdr-streamdev-0.5.0.tgz diff --git a/vdr-streamdev.spec b/vdr-streamdev.spec index c1d3976..9cb661f 100644 --- a/vdr-streamdev.spec +++ b/vdr-streamdev.spec @@ -1,13 +1,13 @@ %define pname streamdev -%define prever 20090706 +#define prever 20090706 %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.5.0 -Release: 0.2.pre%{prever}%{?dist} -Summary: Streaming plugin for VDR +Release: 1%{?dist} +Summary: Streaming plug-in for VDR Group: Applications/Multimedia License: GPL+ and GPLv2+ @@ -18,14 +18,14 @@ Source1: %{name}-server.conf Source2: %{name}-client.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: vdr-devel >= 1.3.47 +BuildRequires: vdr-devel >= 1.5.9 BuildRequires: gettext %description -The streamdev plugin adds streaming capabilities to your VDR. +The streamdev plug-in adds streaming capabilities to your VDR. %package server -Summary: Streaming server plugin for VDR +Summary: Streaming server plug-in for VDR Group: Applications/Multimedia Requires: vdr(abi) = %{apiver} @@ -34,7 +34,7 @@ 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 +Summary: Streaming client plug-in for VDR Group: Applications/Multimedia Requires: vdr(abi) = %{apiver} @@ -45,6 +45,8 @@ VDR will then be able to work even without a DVB device. %prep %setup -q -n %{pname}-%{version}%{?prever:-pre-%{prever}} +sed -i 's@$(VDRDIR)/device.h@%{_includedir}/vdr/device.h@' Makefile + for f in CONTRIBUTORS HISTORY; do iconv -f iso8859-1 -t utf-8 $f >$f.conv touch -r $f $f.conv @@ -58,10 +60,10 @@ make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr LOCALEDIR=$RPM_BUILD_ROOT%{_ 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 streamdev/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf -install -Dpm 755 streamdev/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh +install -pm 755 server/libvdr-%{pname}-server.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} +install -pm 755 client/libvdr-%{pname}-client.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} +install -Dpm 644 streamdev-server/streamdevhosts.conf $RPM_BUILD_ROOT%{configdir}/plugins/streamdevhosts.conf +install -Dpm 755 streamdev-server/externremux.sh $RPM_BUILD_ROOT%{_libdir}/vdr/bin/externremux.sh install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}-server.conf install -Dpm 644 %{SOURCE2} \ @@ -85,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README %changelog +* Sun Jul 25 2010 Felix Kaechele - 0.5.0-1 +- update to final 0.5.0 release + * Sat Jan 02 2010 Felix Kaechele - 0.5.0-0.2.pre20090706 - added missing BuildReq: gettext From a4b339d36dd1ffd16732f3999e77a920d692729b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:56:02 +0000 Subject: [PATCH 5/5] 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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 9c01806..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -vdr-streamdev-0_3_4-2_fc9:HEAD:vdr-streamdev-0.3.4-2.fc9.src.rpm:1221203534