[packages/vdr] - updated to 2.0.0

Tue Apr 9 17:38:45 CEST 2013

commit d7e912131cc88eee93de5843fc04e26058562ac1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Apr 9 17:38:50 2013 +0200

    - updated to 2.0.0

 vdr.spec | 57 +++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 20 deletions(-)
---

diff --git a/vdr.spec b/vdr.spec
index b25318a..ad62e30 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -1,27 +1,30 @@
 #
 # Conditional build:
-%bcond_with	sc	# softCAM support
-%bcond_with	xine	# xine support, requires patched xine-lib-devel
+%bcond_with	sc	# softCAM support (outdated code)
+%bcond_with	xine	# xine support (outdated code)
 #
-%define		_sc_ver		0.9.3
-%define		_xine_ver	0.9.4
+%define		sc_ver		0.9.3
+%define		xine_ver	0.9.4
 Summary:	Video Disk Recorder
 Summary(pl.UTF-8):	Video Disk Recorder - narzędzie do nagrywania filmów
 Name:		vdr
-Version:	1.7.23
-Release:	3
+Version:	2.0.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	ftp://ftp.tvdr.de/vdr/Developer/%{name}-%{version}.tar.bz2
-# Source0-md5:	de136f7be28c4b6f1fa0e2218b4acc11
-Source1:	http://207.44.152.197/%{name}-sc-%{_sc_ver}.tar.gz
+Source0:	ftp://ftp.tvdr.de/vdr/%{name}-%{version}.tar.bz2
+# Source0-md5:	fd7f481b996e03fae3c00e80b6b0d301
+Source1:	http://207.44.152.197/%{name}-sc-%{sc_ver}.tar.gz
 # Source1-md5:	d02d88213fcfb9b6c3f8c819eab4be68
-Source2:	http://home.vrweb.de/~rnissl/%{name}-xine-%{_xine_ver}.tgz
+Source2:	http://home.vrweb.de/~rnissl/%{name}-xine-%{xine_ver}.tgz
 # Source2-md5:	0374123d6991f55d91122b020361d8f6
 URL:		http://www.tvdr.de/
 BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel >= 2
 BuildRequires:	fribidi-devel
+BuildRequires:	libcap-devel
 BuildRequires:	libjpeg-devel
+BuildRequires:	ncurses-devel >= 5
 %{?with_xine:BuildRequires:	xine-lib-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,7 +86,7 @@ cd ../..
 %if %{with sc}
 cd PLUGINS/src
 gzip -dc %{SOURCE1} | tar -xf -
-mv sc-%{_sc_ver} sc
+mv sc-%{sc_ver} sc
 cd ../..
 %{__patch} -p1 < PLUGINS/src/sc/patches/vdr-1.4.x-sc7.diff
 %endif
@@ -91,7 +94,7 @@ cd ../..
 %if %{with xine}
 cd PLUGINS/src
 gzip -dc %{SOURCE2} | tar -xf -
-mv xine-%{_xine_ver} xine
+mv xine-%{xine_ver} xine
 cd ../..
 %endif
 
@@ -99,7 +102,7 @@ cd ../..
 %{__make} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcflags}" \
+	CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
 	PREFIX="%{_prefix}" \
 	LOCDIR="%{_localedir}" \
 	CONFDIR="%{_sysconfdir}/%{name}" \
@@ -135,6 +138,7 @@ for langdir in $RPM_BUILD_ROOT%{_datadir}/locale/*_*; do
 	mv $RPM_BUILD_ROOT%{_datadir}/locale/{$lang,$newlang}
 done
 
+# vdr, vdr-dvbhddevice, vdr-hello, vdr-pictures, vdr-skincurses domains
 %find_lang %{name} --all-name
 
 %clean
@@ -146,35 +150,48 @@ rm -rf $RPM_BUILD_ROOT
 %attr(2775,root,video) %dir %{_sysconfdir}/%{name}
 %attr(2775,root,video) %dir %{_sysconfdir}/%{name}/plugins
 %attr(2775,root,video) %dir %{_sysconfdir}/%{name}/themes
-%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf*
-%attr(755,root,root) %{_bindir}/%{name}
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/channels.conf
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/channels.conf.cable
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/channels.conf.terr
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/diseqc.conf
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/keymacros.conf
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/scr.conf
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/sources.conf
+%attr(664,root,video) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/svdrphosts.conf
+%attr(755,root,root) %{_bindir}/vdr
 %attr(755,root,root) %{_bindir}/svdrpsend
 %dir %{_libdir}/vdr
 %attr(755,root,root) %{_libdir}/vdr/libvdr-dvbhddevice.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-dvbsddevice.so.*
+%attr(755,root,root) %{_libdir}/vdr/libvdr-epgtableid0.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-hello.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-osddemo.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-pictures.so.*
+%attr(755,root,root) %{_libdir}/vdr/libvdr-rcu.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-skincurses.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-status.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-svccli.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-svcsvr.so.*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-svdrpdemo.so.*
-%attr(2775,root,video) /var/lib/%{name}
-%{_mandir}/man*/%{name}.*
+%attr(2775,root,video) %dir /var/lib/%{name}
+# XXX: %ghost or %config?
+%attr(664,root,video) /var/lib/%{name}/*.conf
+%{_mandir}/man1/svdrpsend.1*
+%{_mandir}/man1/vdr.1*
+%{_mandir}/man5/vdr.5*
 
 %files devel
 %defattr(644,root,root,755)
 %doc README.i18n
 %{_includedir}/libsi
-%{_includedir}/%{name}
-%{_pkgconfigdir}/%{name}.pc
+%{_includedir}/vdr
+%{_pkgconfigdir}/vdr.pc
 
 %if %{with sc}
 %files sc
 %defattr(644,root,root,755)
 %doc PLUGINS/src/sc/{HISTORY,README}
-%attr(755,root,root) %{_libdir}/libsc*
+%attr(755,root,root) %{_libdir}/libsc-*.so*
 %attr(755,root,root) %{_libdir}/vdr/libvdr-sc.so.*
 %endif
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vdr.git/commitdiff/d7e912131cc88eee93de5843fc04e26058562ac1

