rpms/vdr/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 vdr.init, 1.4, 1.5 vdr.spec, 1.15, 1.16
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Fri Oct 12 19:01:29 UTC 2007
- Previous message (by thread): rpms/kernel/devel patch-2.6.23.1.bz2.sign, NONE, 1.1 .cvsignore, 1.705, 1.706 sources, 1.666, 1.667
- Next message (by thread): rpms/kernel/F-7 kernel-2.6.spec, 1.3353, 1.3354 linux-2.6-e100-race.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30477
Modified Files:
.cvsignore sources vdr.init vdr.spec
Log Message:
* Fri Oct 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-5
- Fix init script not to start a new vdr if it's already running (#247089).
- Update subtitles+ttxtsubs patch to Rolf's latest revision.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 1 Aug 2007 20:49:04 -0000 1.12
+++ .cvsignore 12 Oct 2007 19:00:55 -0000 1.13
@@ -1,3 +1,4 @@
vdr_1.4.5-2.ds.diff.gz
vdr-1.4.7.tar.bz2
vdr-1.4.7-liemikuutio-1.13.diff.gz
+vdr-1.4.7-subtitles-0.5.0-and-ttxtsubs-0.0.5.diff.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 1 Aug 2007 20:49:04 -0000 1.12
+++ sources 12 Oct 2007 19:00:55 -0000 1.13
@@ -1,3 +1,4 @@
3e9287f726df5a667054a15078235791 vdr_1.4.5-2.ds.diff.gz
81be33a0edb93288ca3d235a04107ec4 vdr-1.4.7.tar.bz2
7b43fa7a9c0d45e5f24ba6143926e720 vdr-1.4.7-liemikuutio-1.13.diff.gz
+5a20307263224153df63d79e047a5793 vdr-1.4.7-subtitles-0.5.0-and-ttxtsubs-0.0.5.diff.gz
Index: vdr.init
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr.init 1 Aug 2007 20:49:04 -0000 1.4
+++ vdr.init 12 Oct 2007 19:00:55 -0000 1.5
@@ -8,7 +8,6 @@
# received from satellites (DVB-S) as well as cable (DVB-C) \
# and terrestrial (DVB-T) signals. At least one DVB card \
# is required to run VDR.
-# processname: vdr
### BEGIN INIT INFO
# Provides: vdr
@@ -53,7 +52,7 @@
start() {
echo -n $"Starting Video Disk Recorder ($prog): "
checkconf || return $?
- VDR_INIT=1 daemon --check=$prog "$runner >/dev/null 2>&1 &"
+ status $prog &>/dev/null || VDR_INIT=1 daemon "$runner >/dev/null 2>&1 &"
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vdr.spec 16 Aug 2007 09:29:09 -0000 1.15
+++ vdr.spec 12 Oct 2007 19:00:55 -0000 1.16
@@ -19,7 +19,7 @@
Name: vdr
Version: 1.4.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -48,6 +48,7 @@
Patch4: %{name}-1.4.1-dumpable.patch
# http://article.gmane.org/gmane.linux.vdr/32708
Patch5: %{name}-1.4.6-1-syncearly.patch
+Patch6: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.7-subtitles-0.5.0-and-ttxtsubs-0.0.5.diff.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -128,13 +129,14 @@
patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
patch -i debian/patches/opt-20_epgsearch.dpatch
#patch -i debian/patches/opt-20_liemikuutio.dpatch
-patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
+#patch -i debian/patches/opt-20_subtitles_0.4.0_ttxtsubs_0.0.5.dpatch
patch -i debian/patches/opt-20_suspend.dpatch
patch -i debian/patches/opt-20_vdr-timer-info.dpatch
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p0
+%patch6 -p1
# Fix up paths
sed -i \
@@ -439,6 +441,10 @@
%endif
%changelog
+* Fri Oct 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-5
+- Fix init script not to start a new vdr if it's already running (#247089).
+- Update subtitles+ttxtsubs patch to Rolf's latest revision.
+
* Mon Aug 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.7-4
- License: GPL+ for skincurses and sky plugins.
- Previous message (by thread): rpms/kernel/devel patch-2.6.23.1.bz2.sign, NONE, 1.1 .cvsignore, 1.705, 1.706 sources, 1.666, 1.667
- Next message (by thread): rpms/kernel/F-7 kernel-2.6.spec, 1.3353, 1.3354 linux-2.6-e100-race.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list