rpms/kdebase-runtime/F-9 kdebase-runtime-4.0.72-pulseaudio.patch, NONE, 1.1 kdebase-runtime-4.1.x-searchproviders-shortcuts.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdebase-runtime.spec, 1.46, 1.47 sources, 1.12, 1.13 kdebase-runtime-4.0.3-khelpcenter.patch, 1.1, NONE kdebase-runtime-4.0.3-pulseaudio.patch, 1.1, NONE kdebase-runtime-4.0.5-knotify-noaudio.patch, 1.1, NONE kdebase-runtime-4.0.x-searchproviders-shortcuts.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sat Jul 19 18:02:50 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdebase-runtime/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4326
Modified Files:
.cvsignore kdebase-runtime.spec sources
Added Files:
kdebase-runtime-4.0.72-pulseaudio.patch
kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
Removed Files:
kdebase-runtime-4.0.3-khelpcenter.patch
kdebase-runtime-4.0.3-pulseaudio.patch
kdebase-runtime-4.0.5-knotify-noaudio.patch
kdebase-runtime-4.0.x-searchproviders-shortcuts.patch
Log Message:
* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
- 4.0.99
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]),
kdebase-runtime-4.1.x-searchproviders-shortcuts.patch:
--- NEW FILE kdebase-runtime-4.1.x-searchproviders-shortcuts.patch ---
diff -up kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop.orig kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop
--- kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop.orig 2008-06-05 13:19:46.000000000 +0200
+++ kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/bugzilla.desktop 2008-06-05 13:21:39.000000000 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Hidden=false
+Type=Service
+Name=Red Hat bug tracking system
+ServiceTypes=SearchProvider
+Keys=rhbug,bz
+Query=http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=\\1
diff -up kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop.orig kdebase-runtime-4.0.5/kurifilter-plugins/ikws/searchproviders/fedora.desktop
--- kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop.orig 2008-06-05 13:20:19.000000000 +0200
+++ kdebase-runtime-4.0.80/kurifilter-plugins/ikws/searchproviders/fedora.desktop 2008-06-05 13:20:47.000000000 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Hidden=false
+Keys=fp,fedora
+Name=fedoraproject
+Query=http://fedoraproject.org/wiki/?action=fullsearch&context=180&value=\\{@}&titlesearch=Titles
+ServiceTypes=SearchProvider
+Type=Service
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 2 Jun 2008 11:50:32 -0000 1.12
+++ .cvsignore 19 Jul 2008 18:02:03 -0000 1.13
@@ -1,2 +1 @@
-kdebase-runtime-4.0.4.tar.bz2
-kdebase-runtime-4.0.5.tar.bz2
+kdebase-runtime-4.0.99.tar.bz2
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-9/kdebase-runtime.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- kdebase-runtime.spec 5 Jun 2008 12:08:37 -0000 1.46
+++ kdebase-runtime.spec 19 Jul 2008 18:02:03 -0000 1.47
@@ -8,22 +8,17 @@
Name: kdebase-runtime
Summary: K Desktop Environment - Runtime
-Version: 4.0.5
-Release: 2%{?dist}
+Version: 4.0.99
+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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
Source1: khelpcenter.desktop
-Patch1: kdebase-runtime-4.0.3-pulseaudio.patch
-Patch2: kdebase-runtime-4.0.3-khelpcenter.patch
-Patch3: kdebase-runtime-4.0.x-searchproviders-shortcuts.patch
-
-# ustream patches
-Patch100: kdebase-runtime-4.0.5-knotify-noaudio.patch
+Patch0: kdebase-runtime-4.0.72-pulseaudio.patch
+Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch noarch
%define icons 1
@@ -59,7 +54,7 @@
BuildRequires: pcre-devel
BuildRequires: pkgconfig
BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel >= 1.97.1
+BuildRequires: soprano-devel >= 2.0.97
BuildRequires: strigi-devel >= 0.5.7
BuildRequires: xine-lib-devel
# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
@@ -90,18 +85,23 @@
%description -n oxygen-icon-theme-scalable
%{summary}.
+%package -n phonon-backend-xine
+Summary: Xine phonon backend
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+# not sure exactly how best to version this one -- Rex
+Provides: phonon-backend = 4.2
+# (temporary) upgrade path
+Obsoletes: kdebase-runtime < 4.0.98-3
+%description -n phonon-backend-xine
+%{summary}.
+
%prep
%setup -q -n kdebase-runtime-%{version}
-%if 0%{?fedora} > 7
-%patch1 -p1 -b .pulseaudio
-%endif
-%patch2 -p1 -b .khelpcenter
-%patch3 -p1 -b .searchproviders-shortcuts
-
-# upstream patches
-%patch100 -p1 -b .-knotify-noaudio.patch
+%patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .searchproviders-shortcuts
%build
@@ -124,7 +124,11 @@
%if 0%{?icons}
make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+%if ! 0%{?rest}
+ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
+%endif
%else
+rm -f %{buildroot}%{_kde4_iconsdir}/default.kde4
rm -rf %{buildroot}%{_kde4_iconsdir}/oxygen
%endif
@@ -222,6 +226,15 @@
# so we can't use desktop-file-install for it.
install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
%endif
+
+# FIXME: -devel type files, omit for now
+rm -rf %{buildroot}%{_kde4_includedir}/phonon/
+rm -f %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so
+# /usr/include/kde4/phonon/audiodevice.h
+# /usr/include/kde4/phonon/audiodeviceenumerator.h
+# /usr/include/kde4/phonon/kaudiodevicelist_export.h
+# /usr/lib64/libkaudiodevicelist.so
+
%endif
@@ -263,15 +276,19 @@
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_appsdir}/*
-%{_kde4_configdir}/khotnewstuff.knsrc
+%{_kde4_configdir}/*.knsrc
+%{_kde4_datadir}/autostart/nepomukserver.desktop
%{_kde4_datadir}/config.kcfg/
%{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/services/*
%{_kde4_datadir}/kde4/services/*
%{_kde4_datadir}/kde4/servicetypes/*
%{_kde4_datadir}/sounds/*
+%{_kde4_libdir}/kconf_update_bin/*
%{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/libkaudiodevicelist.so.*
%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/plugins/phonon_platform/
%{_kde4_libexecdir}/*
%{_kde4_libdir}/kde4/plugins/styles/
%{_libdir}/strigi/*
@@ -284,18 +301,32 @@
%{_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
%{_kde4_datadir}/locale/l10n/*/entry.desktop
%{_datadir}/services/khelpcenter.desktop
%endif
+
+%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
+%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%exclude %{_kde4_libdir}/kde4/phonon_xine.so
+%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
+%files -n phonon-backend-xine
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/kcm_phononxine.so
+%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%{_kde4_libdir}/kde4/phonon_xine.so
+%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
%endif
%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}
@@ -306,15 +337,46 @@
%changelog
-* Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.5-2
-- add searchproviders-shortcuts for redhat bugzilla
-- backport to make "No audio" option working again
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
+- 4.0.99
+
+* Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-4
+- respin
+
+* Mon Jul 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-3
+- -phonon-backend-xine: new subpkg
+
+* Thu Jul 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-1
+- 4.0.98
+
+* Sun Jul 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.85-1
+- 4.0.85
+
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.84-1
+- 4.0.84
+
+* Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1
+- 4.0.83 (beta2)
+
+* Sat Jun 14 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
+- 4.0.82
+
+* Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.80-2
+- add searchproviders-shortcuts for redhat bugzilla
+
+* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
+- 4.1 beta 1
-* Mon Jun 02 2008 Than Ngo <than at redhat.com> 4.0.5-1
-- 4.0.5
+* Tue May 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-2
+- BR new minimum version of soprano-devel
-* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> - 4.0.4-1
-- kde-4.0.4
+* 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/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 2 Jun 2008 11:50:32 -0000 1.12
+++ sources 19 Jul 2008 18:02:03 -0000 1.13
@@ -1 +1 @@
-6af10ce1df37ae231387581bd3941071 kdebase-runtime-4.0.5.tar.bz2
+265fa06347c83c8b9c6bc1d1259e83f2 kdebase-runtime-4.0.99.tar.bz2
--- kdebase-runtime-4.0.3-khelpcenter.patch DELETED ---
--- kdebase-runtime-4.0.3-pulseaudio.patch DELETED ---
--- kdebase-runtime-4.0.5-knotify-noaudio.patch DELETED ---
--- kdebase-runtime-4.0.x-searchproviders-shortcuts.patch DELETED ---
More information about the scm-commits
mailing list