rpms/vdr/FC-6 vdr-1.4.6-paths.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 vdr.spec, 1.6, 1.7 vdr-1.4.1-paths.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue May 1 19:06:44 UTC 2007
- Previous message (by thread): rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.16,1.17
- Next message (by thread): rpms/vdr-skins/FC-6 sttng-blue.theme, NONE, 1.1 vdr-skins-aluminium-i18n.patch, NONE, 1.1 vdr-skins-egalsimple-i18n.patch, NONE, 1.1 vdr-skins-izegrey16-i18n.patch, NONE, 1.1 vdr-skins-prepare-tarballs.sh, NONE, 1.1 vdr-skins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/vdr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20794
Modified Files:
.cvsignore sources vdr.spec
Added Files:
vdr-1.4.6-paths.patch
Removed Files:
vdr-1.4.1-paths.patch
Log Message:
* Tue May 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-3
- Upstream 1.4.6-1, refresh other patches.
* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-2
- Relocate themes to /var/lib/vdr/themes (#216355).
- Tighten up some directory permissions.
* Sun Mar 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-1
- 1.4.6.
vdr-1.4.6-paths.patch:
--- NEW FILE vdr-1.4.6-paths.patch ---
diff -p -u vdr-1.4.6/PLUGINS/src/sky/README~ vdr-1.4.6/PLUGINS/src/sky/README
--- vdr-1.4.6/PLUGINS/src/sky/README~ 2004-02-15 14:39:19.000000000 +0200
+++ vdr-1.4.6/PLUGINS/src/sky/README 2007-04-23 21:55:19.000000000 +0300
@@ -33,7 +33,7 @@ derived from the actual channel data and
data for each channel can be found (see below). Copy this file to your
plugins config directory, in a subdirectory named 'sky', as in
-/video/plugins/sky/channels.conf.sky
+__CONFIGDIR__/plugins/sky/channels.conf.sky
The Sky EPG is available on the Internet at http://www.bleb.org.
The Perl script getskyepg.pl extracts the EPG data from these pages
diff -p -u vdr-1.4.6/epg2html.pl~ vdr-1.4.6/epg2html.pl
--- vdr-1.4.6/epg2html.pl~ 2006-04-17 15:19:08.000000000 +0300
+++ vdr-1.4.6/epg2html.pl 2007-04-23 21:55:19.000000000 +0300
@@ -2,12 +2,12 @@
# A simple EPG to HTML converter
#
-# Converts the EPG data written by 'vdr' into the file /video/epg.data
+# Converts the EPG data written by 'vdr' into the file __CACHEDIR__/epg.data
# into a simple HTML programme listing, consisting of one file per channel
# plus an 'index.htm' file. All output files are written into the current
# directory.
#
-# Usage: epg2html.pl < /video/epg.data
+# Usage: epg2html.pl < __CACHEDIR__/epg.data
#
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
diff -p -u vdr-1.4.6/vdr.1~ vdr-1.4.6/vdr.1
--- vdr-1.4.6/vdr.1~ 2007-01-07 16:03:56.000000000 +0200
+++ vdr-1.4.6/vdr.1 2007-04-23 21:55:19.000000000 +0300
@@ -45,7 +45,7 @@ Send Dolby Digital audio to stdin of com
.TP
.BI \-c\ dir ,\ \-\-config= dir
Read config files from directory \fIdir\fR
-(default is to read them from the video directory).
+(default is to read them from __CONFIGDIR__).
.TP
.B \-d, \-\-daemon
Run in daemon mode (implies \-\-no\-kbd).
@@ -56,7 +56,7 @@ There may be several \fB\-D\fR options (
.TP
.BI \-E\ file ,\ \-\-epgfile= file
Write the EPG data into the given \fIfile\fR
-(default is \fI/video/epg.data\fR).
+(default is \fI__CACHEDIR__/epg.data\fR).
Use \fB\-E\-\fR to disable this.
If \fIfile\fR is a directory, the file \fIepg.data\fR
will be created in that directory.
@@ -80,7 +80,7 @@ If logging should be done to LOG_LOCAL\f
LOG_USER, add '.n' to LEVEL, as in 3.7 (n=0..7).
.TP
.BI \-L\ dir ,\ \-\-lib= dir
-Search for plugins in directory \fIdir\fR (default is ./PLUGINS/lib).
+Search for plugins in directory \fIdir\fR (default is __PLUGINDIR__).
There can be several \fB\-L\fR options with different \fIdir\fR values.
Each of them will apply to the \fB\-P\fR options following it.
.TP
@@ -145,7 +145,7 @@ with VFAT file systems.
.TP
.BI \-v\ dir ,\ \-\-video= dir
Use \fIdir\fR as video directory.
-The default is \fI/video\fR.
+The default is \fI__VIDEODIR__\fR.
.TP
.B \-V, \-\-version
Print version information and exit.
diff -p -u vdr-1.4.6/vdr.5~ vdr-1.4.6/vdr.5
--- vdr-1.4.6/vdr.5~ 2007-01-07 16:04:12.000000000 +0200
+++ vdr-1.4.6/vdr.5 2007-04-23 21:55:19.000000000 +0300
@@ -501,7 +501,7 @@ The file \fIsetup.conf\fR contains the b
Each line contains one option in the format "Name = Value".
See the MANUAL file for a description of the available options.
.SS THEMES
-The files \fIthemes/<skin>\-<theme>.theme\fR in the config directory contain the
+The files \fI__VARDIR__/themes/<skin>\-<theme>.theme\fR contain the
color theme definitions for the various skins. In the actual file names \fI<skin>\fR
will be replaced by the name if the skin this theme belongs to, and \fI<theme>\fR
will be the name of this theme.
diff -p -u vdr-1.4.6/vdr.c~ vdr-1.4.6/vdr.c
--- vdr-1.4.6/vdr.c~ 2006-12-02 18:22:12.000000000 +0200
+++ vdr-1.4.6/vdr.c 2007-04-23 21:55:19.000000000 +0300
@@ -380,7 +380,7 @@ int main(int argc, char *argv[])
" there may be several -D options (default: all DVB\n"
" devices will be used)\n"
" -E FILE, --epgfile=FILE write the EPG data into the given FILE (default is\n"
- " '%s' in the video directory)\n"
+ " __CACHEDIR__/%s)\n"
" '-E-' disables this\n"
" if FILE is a directory, the default EPG file will be\n"
" created in that directory\n"
@@ -517,10 +517,10 @@ int main(int argc, char *argv[])
// Configuration data:
if (!ConfigDirectory)
- ConfigDirectory = VideoDirectory;
+ ConfigDirectory = "__CONFIGDIR__";
cPlugin::SetConfigDirectory(ConfigDirectory);
- cThemes::SetThemesDirectory(AddDirectory(ConfigDirectory, "themes"));
+ cThemes::SetThemesDirectory("__VARDIR__/themes");
Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
EpgDataFileName = DEFAULTEPGDATAFILENAME;
}
else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
- EpgDirectory = VideoDirectory;
+ EpgDirectory = "__CACHEDIR__";
if (EpgDirectory)
cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
else
diff -p -u vdr-1.4.6/newplugin~ vdr-1.4.6/newplugin
--- vdr-1.4.6/newplugin~ 2006-09-09 15:38:35.000000000 +0300
+++ vdr-1.4.6/newplugin 2007-04-23 21:55:19.000000000 +0300
@@ -24,7 +24,7 @@ $PLUGIN_VERSION = "0.0.1";
$PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
$PLUGIN_MAINENTRY = $PLUGIN_CLASS;
-$PLUGINS_SRC = "PLUGINS/src";
+$PLUGINS_SRC = ".";
$README = qq
{This is a "plugin" for the Video Disk Recorder (VDR).
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 25 Feb 2007 22:00:30 -0000 1.7
+++ .cvsignore 1 May 2007 19:06:13 -0000 1.8
@@ -1,5 +1,4 @@
-vdr-1.4.5.tar.bz2
-vdr_1.4.5-1.ds.diff.gz
-vdr-1.4.5-liemikuutio-1.13.diff.gz
-vdr-1.4.5-1.diff
-vdr-1.4.5-2.diff
+vdr_1.4.5-2.ds.diff.gz
+vdr-1.4.6.tar.bz2
+vdr-1.4.6-1.diff
+vdr-1.4.6-liemikuutio-1.13.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 25 Feb 2007 22:00:30 -0000 1.7
+++ sources 1 May 2007 19:06:13 -0000 1.8
@@ -1,5 +1,4 @@
-db7e60927b673ca06d38a7669cab44c9 vdr-1.4.5.tar.bz2
-22e0c893539a8d480e80de4dd0368030 vdr_1.4.5-1.ds.diff.gz
-fa9f9128032a08a22a3051a4caf65462 vdr-1.4.5-liemikuutio-1.13.diff.gz
-01883b64ec3736cbab46f16aeba6ef58 vdr-1.4.5-1.diff
-bca536bb5011bf59abc68bed285b9117 vdr-1.4.5-2.diff
+3e9287f726df5a667054a15078235791 vdr_1.4.5-2.ds.diff.gz
+0769b05929ccc012dfd696ed13a3d161 vdr-1.4.6.tar.bz2
+64f63ba69c112b9de542760ce0e5ff2e vdr-1.4.6-1.diff
+7616b9dddf6bd766ee0db0edbd651e54 vdr-1.4.6-liemikuutio-1.13.diff.gz
Index: vdr.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr.spec 25 Feb 2007 22:00:30 -0000 1.6
+++ vdr.spec 1 May 2007 19:06:13 -0000 1.7
@@ -18,8 +18,8 @@
%define apiver 1.4.5
Name: vdr
-Version: 1.4.5
-Release: 4%{?dist}
+Version: 1.4.6
+Release: 3%{?dist}
Summary: Video Disk Recorder
Group: Applications/Multimedia
@@ -40,12 +40,11 @@
Source13: %{name}-timercmds.conf
Source14: %{name}-shutdown.sh
Patch0: %{name}-channel+epg.patch
-Patch1: http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.5-1.ds.diff.gz
-Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.5-liemikuutio-1.13.diff.gz
-Patch3: %{name}-1.4.1-paths.patch
+Patch1: http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.5-2.ds.diff.gz
+Patch2: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.6-liemikuutio-1.13.diff.gz
+Patch3: %{name}-1.4.6-paths.patch
Patch4: %{name}-1.4.1-dumpable.patch
-Patch5: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.5-1.diff
-Patch6: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.5-2.diff
+Patch5: ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.6-1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel
@@ -132,16 +131,15 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
# Fix up paths
-sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
sed -i \
-e 's|__CACHEDIR__|%{cachedir}|' \
-e 's|__CONFIGDIR__|%{configdir}|' \
-e 's|__PLUGINDIR__|%{plugindir}|' \
+ -e 's|__VARDIR__|%{vardir}|' \
-e 's|__VIDEODIR__|%{videodir}|' \
- epg2html.pl vdr.1 vdr.c PLUGINS/src/sky/README
+ epg2html.pl vdr.1 vdr.5 vdr.c PLUGINS/src/sky/README
# Fix up man page section
sed -i -e 's/\bvdr\(\s*\)(1)/vdr\1(8)/' HISTORY UPDATE-1.2.0 vdr.5
@@ -171,9 +169,9 @@
# only, but rename() in cSafeFile barks "device or resource busy", cf.
# http://lists.suse.com/archive/suse-programming-e/2003-Mar/0051.html
cat << EOF > %{name}.rwtab
-dirs %{cachedir}
-files %{configdir}
-files %{vardir}
+dirs %{cachedir}
+files %{configdir}
+files %{vardir}
EOF
@@ -252,8 +250,8 @@
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d
-install -dm 755 $RPM_BUILD_ROOT%{configdir}/themes
-touch $RPM_BUILD_ROOT%{configdir}/themes/{classic,sttng}-default.theme
+install -dm 755 $RPM_BUILD_ROOT%{vardir}/themes
+touch $RPM_BUILD_ROOT%{vardir}/themes/{classic,sttng}-default.theme
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/vdr
sed -i \
@@ -380,21 +378,21 @@
%{datadir}/
%{_mandir}/man[58]/vdr.[58]*
%defattr(-,%{vdr_user},%{vdr_group},-)
-%dir %{rundir}/
-# TODO: tighten this (root:root ownership to some files/dirs)?
-%dir %{configdir}/
-%dir %{configdir}/plugins/
-%dir %{configdir}/themes/
-%ghost %{configdir}/themes/*.theme
+# TODO: tighten ownerships to root:root for some files in %{configdir}
%config(noreplace) %{configdir}/*.conf
%dir %{videodir}/
%dir %{audiodir}/
+%ghost %{vardir}/acpi-wakeup
+%ghost %{vardir}/themes/*.theme
+%ghost %{cachedir}/epg.data
%defattr(-,%{vdr_user},root,-)
+%dir %{configdir}/
+%dir %{configdir}/plugins/
%dir %{logdir}/
+%dir %{rundir}/
%dir %{vardir}/
-%ghost %{vardir}/acpi-wakeup
+%dir %{vardir}/themes/
%dir %{cachedir}/
-%ghost %{cachedir}/epg.data
%files devel
%defattr(-,root,root,-)
@@ -427,6 +425,16 @@
%endif
%changelog
+* Tue May 1 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-3
+- Upstream 1.4.6-1, refresh other patches.
+
+* Mon Apr 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-2
+- Relocate themes to /var/lib/vdr/themes (#216355).
+- Tighten up some directory permissions.
+
+* Sun Mar 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.6-1
+- 1.4.6.
+
* Sat Feb 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.4.5-4
- Upstream 1.4.5-2.
--- vdr-1.4.1-paths.patch DELETED ---
- Previous message (by thread): rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.16,1.17
- Next message (by thread): rpms/vdr-skins/FC-6 sttng-blue.theme, NONE, 1.1 vdr-skins-aluminium-i18n.patch, NONE, 1.1 vdr-skins-egalsimple-i18n.patch, NONE, 1.1 vdr-skins-izegrey16-i18n.patch, NONE, 1.1 vdr-skins-prepare-tarballs.sh, NONE, 1.1 vdr-skins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list