rpms/vdr/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 vdr.spec, 1.10, 1.11

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6543

Modified Files:
	.cvsignore sources vdr.spec 
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.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vdr/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	2 Apr 2007 14:34:46 -0000	1.9
+++ .cvsignore	1 May 2007 11:12:14 -0000	1.10
@@ -1,3 +1,4 @@
-vdr_1.4.5-1.ds.diff.gz
-vdr-1.4.5-liemikuutio-1.13.diff.gz
+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/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	2 Apr 2007 14:34:46 -0000	1.9
+++ sources	1 May 2007 11:12:14 -0000	1.10
@@ -1,3 +1,4 @@
-22e0c893539a8d480e80de4dd0368030  vdr_1.4.5-1.ds.diff.gz
-fa9f9128032a08a22a3051a4caf65462  vdr-1.4.5-liemikuutio-1.13.diff.gz
+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/devel/vdr.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vdr.spec	23 Apr 2007 21:42:48 -0000	1.10
+++ vdr.spec	1 May 2007 11:12:14 -0000	1.11
@@ -19,7 +19,7 @@
 
 Name:           vdr
 Version:        1.4.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Video Disk Recorder
 
 Group:          Applications/Multimedia
@@ -40,10 +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
+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.6-1.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -129,6 +130,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # Fix up paths
 sed -i \
@@ -423,6 +425,9 @@
 %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.