rpms/vdr-streamdev/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr-streamdev.spec, 1.3, 1.4

[Felix Kaechele]

Author: heffer

Update of /cvs/pkgs/rpms/vdr-streamdev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1371

Modified Files:
	.cvsignore sources vdr-streamdev.spec 
Log Message:
* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.5.0-0.1.pre20090706
- update to latest version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	12 Sep 2008 07:14:30 -0000	1.2
+++ .cvsignore	2 Jan 2010 17:00:11 -0000	1.3
@@ -1 +1 @@
-vdr-streamdev-0.3.4.tgz
+vdr-streamdev-0.5.0-pre-20090706.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	12 Sep 2008 07:14:30 -0000	1.2
+++ sources	2 Jan 2010 17:00:11 -0000	1.3
@@ -1 +1 @@
-dcbe6cb0974a5ff43a1b9bb22086ec64  vdr-streamdev-0.3.4.tgz
+4675d8cd204defad941c65b020bfb04a  vdr-streamdev-0.5.0-pre-20090706.tgz


Index: vdr-streamdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-streamdev/devel/vdr-streamdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- vdr-streamdev.spec	27 Jul 2009 06:47:13 -0000	1.3
+++ vdr-streamdev.spec	2 Jan 2010 17:00:11 -0000	1.4
@@ -1,17 +1,18 @@
 %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.1.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
@@ -41,10 +42,16 @@ Lets your VDR in conjunction with a stre
 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 +59,8 @@ install -dm 755 $RPM_BUILD_ROOT%{plugind
 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 +72,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 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc CONTRIBUTORS COPYING HISTORY PROTOCOL README
 
 %changelog
+* Fri Dec 18 2009 Felix Kaechele <heffer at fedoraproject.org> - 0.5.0-0.1.pre20090706
+- update to latest version
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild