rpms/vdr/FC-6 vdr-timercmds.conf, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vdr.spec, 1.1, 1.2 vdr-1.4.3-1.diff, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/vdr/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27354/FC-6

Modified Files:
	.cvsignore sources vdr.spec 
Added Files:
	vdr-timercmds.conf 
Removed Files:
	vdr-1.4.3-1.diff 
Log Message:
* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.4-1
- 1.4.4.
- Apply epgsearch and timer info patches.
- Mark console.perms snippet noreplace again.



--- NEW FILE vdr-timercmds.conf ---
# Timer commands for VDR.  See the vdr(5) manual page; the syntax is the
# same as for reccmds.conf.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Oct 2006 18:50:35 -0000	1.2
+++ .cvsignore	4 Nov 2006 18:20:48 -0000	1.3
@@ -1,3 +1,3 @@
-vdr-1.4.3-liemikuutio-1.13.diff.gz
-vdr-1.4.3.tar.bz2
 vdr_1.4.3-1.ds.diff.gz
+vdr-1.4.4.tar.bz2
+vdr-1.4.4-liemikuutio-1.13.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2006 18:50:35 -0000	1.2
+++ sources	4 Nov 2006 18:20:49 -0000	1.3
@@ -1,3 +1,3 @@
-ed95f0e5844816d313edcb7f7231e06a  vdr-1.4.3-liemikuutio-1.13.diff.gz
-9bb82d1f090dad746d784d147dbb0126  vdr-1.4.3.tar.bz2
 a0f1441e534715a190e4507c2f58268f  vdr_1.4.3-1.ds.diff.gz
+3d5dbacda725f769099b774577d2e3af  vdr-1.4.4.tar.bz2
+967281c1f666b24cbc3f46cd17dffe98  vdr-1.4.4-liemikuutio-1.13.diff.gz


Index: vdr.spec
===================================================================
RCS file: /cvs/extras/rpms/vdr/FC-6/vdr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vdr.spec	16 Oct 2006 18:50:35 -0000	1.1
+++ vdr.spec	4 Nov 2006 18:20:49 -0000	1.2
@@ -14,11 +14,11 @@
 %define vdr_user  vdr
 %define vdr_group video
 # From APIVERSION in config.h
-%define apiver    1.4.3
+%define apiver    1.4.4
 
 Name:           vdr
-Version:        1.4.3
-Release:        3%{?dist}
+Version:        1.4.4
+Release:        1%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -36,12 +36,12 @@
 Source10:       %{name}-README.package
 Source11:       %{name}-skincurses.conf
 Source12:       %{name}-sky.conf
+Source13:       %{name}-timercmds.conf
 Patch0:         %{name}-channel+epg.patch
 Patch1:         http://zap.tartarus.org/~ds/debian/dists/unstable/main/source/vdr_1.4.3-1.ds.diff.gz
-Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.3-liemikuutio-1.13.diff.gz
+Patch2:         http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-1.4.4-liemikuutio-1.13.diff.gz
 Patch3:         %{name}-1.4.1-paths.patch
 Patch4:         %{name}-1.4.1-dumpable.patch
-Patch10:        ftp://ftp.cadsoft.de/vdr/Developer/vdr-1.4.3-1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -119,15 +119,14 @@
 #patch -i debian/patches/12_skinclassic_icons.dpatch
 #patch -i debian/patches/15_cut_compensate_start_time.dpatch
 patch -i debian/patches/19_debian_osdbase_maxitems.dpatch
-#patch -i debian/patches/opt-20_epgsearch.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_suspend.dpatch
-#patch -i debian/patches/opt-20_vdr-timer-info.dpatch
+patch -i debian/patches/opt-20_vdr-timer-info.dpatch
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch10 -p1
 
 # Fix up paths
 sed -i -e 's|\b\(ConfigDirectory = \)VideoDirectory;|\1"%{configdir}";|' vdr.c
@@ -152,6 +151,7 @@
   PLUGINS/src/sky/{getskyepg.pl,README,HISTORY}
 
 cp -p %{SOURCE5} reccmds.conf
+cp -p %{SOURCE13} timercmds.conf
 sed -e 's|/srv/audio|%{audiodir}|' %{SOURCE6} > commands.conf
 # Unfortunately these can't have comments in them, so ship 'em empty.
 cat /dev/null > channels.conf
@@ -343,8 +343,7 @@
 %doc CONTRIBUTORS COPYING HISTORY* MANUAL README* UPDATE-1.[24].0
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-# Temporarily not noreplace for upgrade from 1.4.1-8 due to #202132
-%config %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config %{_sysconfdir}/sysconfig/vdr-plugins.d/
 %{_initrddir}/vdr
 %{_bindir}/epg2html
@@ -400,6 +399,11 @@
 %endif
 
 %changelog
+* Sat Nov  4 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.4-1
+- 1.4.4.
+- Apply epgsearch and timer info patches.
+- Mark console.perms snippet noreplace again.
+
 * Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4.3-3
 - Apply upstream 1.4.3-1 maintenance patch.
 - Sync with 1.4.3-1.ds, update liemikuutio patch to 1.13.


--- vdr-1.4.3-1.diff DELETED ---