rpms/kdebase-runtime/devel kdebase-runtime-4.0.72-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kdebase-runtime.spec, 1.41, 1.42 sources, 1.10, 1.11 kdebase-runtime-4.0.3-deinterlace-crash.patch, 1.1, NONE kdebase-runtime-4.0.3-pulseaudio.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4610/devel

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.0.72-pulseaudio.patch 
Removed Files:
	kdebase-runtime-4.0.3-deinterlace-crash.patch 
	kdebase-runtime-4.0.3-pulseaudio.patch 
Log Message:
* Tue May 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
- update to 4.0.72 (4.1 alpha 1)
- drop upstreamed deinterlace-crash patch
- drop khelpcenter patch (fixed upstream)
- update Phonon PulseAudio patch
- drop Fedora 7 support
- update file list

kdebase-runtime-4.0.72-pulseaudio.patch:

--- NEW FILE kdebase-runtime-4.0.72-pulseaudio.patch ---
diff -ur kdebase-runtime-4.0.72/phonon/xine/xineengine.cpp kdebase-runtime-4.0.72-pulseaudio/phonon/xine/xineengine.cpp
--- kdebase-runtime-4.0.72/phonon/xine/xineengine.cpp	2008-04-23 17:51:26.000000000 +0200
+++ kdebase-runtime-4.0.72-pulseaudio/phonon/xine/xineengine.cpp	2008-05-06 17:28:52.000000000 +0200
@@ -371,9 +371,9 @@
                                 "in KDE2 and KDE3. Its use is discouraged.</p></html>"),
                             /*icon name */"audio-backend-arts", outputPlugins[i]);
                 } else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
-                    addAudioOutput(nextIndex++, 10, i18n("PulseAudio"),
+                    addAudioOutput(nextIndex++, 2000, i18n("PulseAudio"),
                             xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]),
-                            /*icon name */"audio-backend-pulseaudio", outputPlugins[i], true /*isAdvanced*/);
+                            /*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
                 } else if (0 == strcmp(outputPlugins[i], "esd")) {
                     addAudioOutput(nextIndex++, 8, i18n("Esound (ESD)"),
                             xine_get_audio_driver_plugin_description(xine(), outputPlugins[i]),


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	28 Mar 2008 18:28:09 -0000	1.10
+++ .cvsignore	6 May 2008 15:57:06 -0000	1.11
@@ -1 +1 @@
-kdebase-runtime-4.0.3.tar.bz2
+kdebase-runtime-4.0.72.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdebase-runtime.spec	28 Apr 2008 15:58:52 -0000	1.41
+++ kdebase-runtime.spec	6 May 2008 15:57:06 -0000	1.42
@@ -8,18 +8,15 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.0.3
-Release:       10%{?dist}.1
+Version:       4.0.72
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
-# Don't crash if we don't have deinterlacing support in xine-lib (#440299)
-Patch0:        kdebase-runtime-4.0.3-deinterlace-crash.patch
-Patch1:        kdebase-runtime-4.0.3-pulseaudio.patch
-Patch2:        kdebase-runtime-4.0.3-khelpcenter.patch
+Patch0:        kdebase-runtime-4.0.72-pulseaudio.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -90,11 +87,7 @@
 
 %prep
 %setup -q -n kdebase-runtime-%{version}
-%patch0 -p1 -b .deinterlace-crash
-%if 0%{?fedora} > 7
-%patch1 -p1 -b .pulseaudio
-%endif
-%patch2 -p1 -b .khelpcenter
+%patch0 -p1 -b .pulseaudio
 
 %build
 
@@ -256,7 +249,7 @@
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
 %{_kde4_appsdir}/*
-%{_kde4_configdir}/khotnewstuff.knsrc
+%{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/config.kcfg/
 %{_datadir}/dbus-1/interfaces/*
 %{_datadir}/dbus-1/services/*
@@ -277,7 +270,7 @@
 %{_kde4_datadir}/applications/kde4/Help.desktop
 %{_kde4_datadir}/applications/kde4/knetattach.desktop
 %{_kde4_configdir}/kshorturifilterrc
-%{_kde4_datadir}/desktop-directories/kde-information.directory
+%{_kde4_datadir}/desktop-directories/*.directory
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/*.desktop
@@ -289,6 +282,7 @@
 %if 0%{?icons}
 %files -n oxygen-icon-theme %{?icons_svg:-f svg-exclude.list}
 %defattr(-,root,root,-)
+%{_kde4_iconsdir}/default.kde4
 %{_kde4_iconsdir}/oxygen/
 
 %if 0%{?icons_svg}
@@ -299,6 +293,14 @@
 
 
 %changelog
+* Tue May 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-1
+- update to 4.0.72 (4.1 alpha 1)
+- drop upstreamed deinterlace-crash patch
+- drop khelpcenter patch (fixed upstream)
+- update Phonon PulseAudio patch
+- drop Fedora 7 support
+- update file list
+
 * Mon Apr 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-10.1
 - omit conflicting icons (kde3_desktop=1 case)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	28 Mar 2008 17:15:15 -0000	1.10
+++ sources	6 May 2008 15:57:06 -0000	1.11
@@ -1 +1 @@
-41a47f084ed47c6e44b1a582d2a88fe0  kdebase-runtime-4.0.3.tar.bz2
+41be5359bd69d7d582c0b769341d761f  kdebase-runtime-4.0.72.tar.bz2


--- kdebase-runtime-4.0.3-deinterlace-crash.patch DELETED ---


--- kdebase-runtime-4.0.3-pulseaudio.patch DELETED ---