rpms/kdebase-runtime/F-11 kdebase-runtime-4.4.0-virtuosoconverter.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 kdebase-runtime.spec, 1.133, 1.134 kdebase-runtime-4.1.70-pulseaudio.patch, 1.1, NONE kdebase-runtime-4.3.0-nepomuk-autostart.patch, 1.1, NONE kdebase-runtime-4.3.1-backend-globalconfig.patch, 1.1, NONE kdebase-runtime-4.3.4-kde#202744.patch, 1.1, NONE kdebase-runtime-4.3.4-kde#210463.patch, 1.1, NONE

Wed Feb 10 13:57:39 UTC 2010

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6726/F-11

Modified Files:
	.cvsignore kdebase-runtime.spec 
Added Files:
	kdebase-runtime-4.4.0-virtuosoconverter.patch 
Removed Files:
	kdebase-runtime-4.1.70-pulseaudio.patch 
	kdebase-runtime-4.3.0-nepomuk-autostart.patch 
	kdebase-runtime-4.3.1-backend-globalconfig.patch 
	kdebase-runtime-4.3.4-kde#202744.patch 
	kdebase-runtime-4.3.4-kde#210463.patch 
Log Message:
KDE 4.4.0


kdebase-runtime-4.4.0-virtuosoconverter.patch:
 nepomukcore.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdebase-runtime-4.4.0-virtuosoconverter.patch ---
diff -up kdebase-runtime-4.4.0/nepomuk/services/storage/nepomukcore.cpp.virtuosoconverter kdebase-runtime-4.4.0/nepomuk/services/storage/nepomukcore.cpp
--- kdebase-runtime-4.4.0/nepomuk/services/storage/nepomukcore.cpp.virtuosoconverter	2009-11-23 08:56:46.000000000 -0600
+++ kdebase-runtime-4.4.0/nepomuk/services/storage/nepomukcore.cpp	2010-02-07 19:13:24.135189320 -0600
@@ -23,6 +23,7 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 #include <KStandardDirs>
+#include <KProcess>
 
 #include <QtCore/QTimer>
 
@@ -50,6 +51,10 @@ Nepomuk::Core::~Core()
 void Nepomuk::Core::init()
 {
     // TODO: export the main model on org.kde.NepomukRepository via Soprano::Server::DBusExportModel
+    KProcess p;
+    p << "virtuosoconverter" << "--auto";
+    p.start();
+    p.waitForFinished(-1);
 
     // we have only the one repository
     model( QLatin1String( s_repositoryName ) );


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore	26 Jan 2010 13:02:46 -0000	1.39
+++ .cvsignore	10 Feb 2010 13:57:37 -0000	1.40
@@ -1 +1 @@
-kdebase-runtime-4.3.5.tar.bz2
+kdebase-runtime-4.4.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kdebase-runtime.spec	26 Jan 2010 14:52:40 -0000	1.133
+++ kdebase-runtime.spec	10 Feb 2010 13:57:38 -0000	1.134
@@ -1,15 +1,12 @@
 
 %if 0%{?fedora}
 %define flags 1
-%if 0%{?fedora} > 10
-%define phonon_pa_patch 1
-%endif
 %endif
 
 Name:          kdebase-runtime
-Summary:       K Desktop Environment - Runtime
-Version:       4.3.5
-Release:       2%{?dist}
+Summary:       KDE Runtime
+Version:       4.4.0
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -20,20 +17,15 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
 
-Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.2.85-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-Patch4:        kdebase-runtime-4.3.0-nepomuk-autostart.patch
 Patch5:        kdebase-runtime-4.3.1-manpath.patch
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
-# http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/kdebase4-runtime/current/SOURCES/kdebase-runtime-4.3.1-backend-globalconfig.patch
-Patch7:        kdebase-runtime-4.3.1-backend-globalconfig.patch
 
-# 4.3 Upstream patches
-# https://bugs.kde.org/show_bug.cgi?id=210463
-Patch100: kdebase-runtime-4.3.4-kde#210463.patch
+## 4.4 Upstream patches
+Patch101: kdebase-runtime-4.4.0-virtuosoconverter.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} && 0%{?fedora} < 11
@@ -48,6 +40,9 @@ Conflicts: kdebase4 < 4.3.0
 Provides:  kdebase4-runtime = %{version}-%{release}
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 
+# knotify4 provides dbus service org.freedesktop.Notifications too 
+Provides: desktop-notification-daemon
+
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 %ifnarch s390 s390x
 Requires: eject
@@ -60,27 +55,24 @@ Requires: htdig
 # beware of bootstrapping, there be dragons
 Requires: oxygen-icon-theme >= %{version}
 
-%if 0%{?phonon_pa_patch}
-%define phonon_ver 4.3.50
-BuildRequires: phonon-devel >= %{phonon_ver}
-Requires: phonon%{?_isa} >= %{phonon_ver}
-%endif
-
 BuildRequires: kde-filesystem
 BuildRequires: alsa-lib-devel
+BuildRequires: attica-devel
 BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel
+BuildRequires: exiv2-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
-BuildRequires: kdelibs-experimental-devel
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libsmbclient-devel
+BuildRequires: libssh-devel >= 0.3.92
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel >= 2.3.0
 %if 0%{?fedora}
 BuildRequires: xine-lib-devel libxcb-devel
@@ -92,7 +84,7 @@ BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
 %description
-Core runtime for the K Desktop Environment 4.
+Core runtime for KDE 4.
 
 
 %package libs
@@ -115,21 +107,16 @@ BuildArch: noarch
 
 
 %prep
-%setup -q -n kdebase-runtime-%{version}
+%setup -q -n kdebase-runtime-%{version}%{?alphatag}
 
-%if 0%{?phonon_pa_patch} 
-%patch7 -p1 -b .backend-globalconfig
-%else
-%patch0 -p1 -b .pulseaudio
-%endif
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
 %patch3 -p1 -b .iconthemes-inherit
-%patch4 -p1 -b .nepomuk-autostart
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
 
-%patch100 -p1 -b .kde#210463
+%patch101 -p1 -b .virtuosoconverter
+
 
 %build
 mkdir -p %{_target_platform}
@@ -161,6 +148,10 @@ rm -f %{buildroot}%{_kde4_iconsdir}/hico
 #       so we can't use desktop-file-install for it.
 install -p -D %{SOURCE1} %{buildroot}%{_datadir}/services/khelpcenter.desktop
 
+# installdbgsymbols script
+install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_fedora.sh \
+  %{buildroot}%{_kde4_libexecdir}/installdbgsymbols.sh
+
 # FIXME: -devel type files, omit for now
 rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 
@@ -226,15 +217,20 @@ fi
 %{_kde4_datadir}/emoticons/kde4/
 %{_kde4_datadir}/locale/en_US/entry.desktop
 %{_kde4_datadir}/locale/l10n/
+%{_kde4_datadir}/locale/currency/
 %{?flags:%exclude %{_kde4_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
 
 %files libs
 %defattr(-,root,root,-)
+# unversioned plugin:
+%{_kde4_libdir}/attica_kde.so
 %{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libdir}/libmolletnetwork.so.*
-# FIXME: move some of these to main pkg, e.g. kcm*.so, kded_*.so
 %{_kde4_libdir}/kde4/*.so
+# FIXME: Is this a good idea? Won't multilib apps need KCMs, too?
+%exclude %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
 
@@ -246,23 +242,58 @@ fi
 
 
 %changelog
-* Tue Jan 26 2010 Than Ngo <than at redhat.com> - 4.3.5-2
-- fix kde#210463, Don't watch subdirs for changes unless they've been listed
+* Mon Feb 08 2010 Than Ngo <than at redhat.com> - 4.4.0-3
+- respin
+
+* Sun Feb 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-2
+- nepomuk_fulltextindex patch
+- virtuosoconverter patch
+
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 4.4.0-1
+- 4.4.0
+
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+- notifications for new global shortcuts should be silenced (#549784)
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+
+* Tue Jan 19 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.90-2
+- install installdbgsymbols_fedora.sh as /usr/libexec/kde4/installdbgsymbols.sh
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.85 (4.4rc1)
+
+* Mon Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
+- rebuild (exiv2)
+
+* Sat Jan 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
+- Provides: desktop-notification-daemon
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-4
+- Repositioning the KDE Brand (#547361)
+
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-3
+- BR: attica-devel shared-desktop-ontologies-devel
 
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraprojedct.org> - 4.3.5-1
-- 4.3.5
+* Sat Dec 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- BR exiv2-devel
 
-* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-3
-- backport upstream kded/cpuhog patch (kde#202744)
+* Tue Dec 01 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
 
-* Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2.1
-- enable phonon/pa patch on f11 too
+* Mon Nov 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.2.svn1048496
+- BR libssh-devel >= 0.3.92
 
-* Thu Dec 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2
-- phonon/pulseaudio patch from mandriva, kudos to coling (f12)
+* Sat Nov 21 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- update to 4.3.75 snapshot
 
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-6
+- rebuild (qt-4.6.0-rc1, fc13+)
 
 * Sat Nov 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-5
 - disable manpath patch for now, does more harm than good (#532071)
@@ -280,7 +311,7 @@ fi
 - 4.3.3
 
 * Thu Oct 15 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-4
-- Conflicts: kdebase4 < 4.3.0 instead 
+- Conflicts: kdebase4 < 4.3.0 instead
 
 * Wed Oct 14 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.2-3
 - Conflicts: kdebase < 6:4.3.0
@@ -326,7 +357,7 @@ fi
 - 4.3rc3
 
 * Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
-- respin (soprano-2.3.0) 
+- respin (soprano-2.3.0)
 - License: LGPLv2+
 
 * Thu Jul 09 2009 Than Ngo <than at redhat.com> - 4.2.96-1


--- kdebase-runtime-4.1.70-pulseaudio.patch DELETED ---


--- kdebase-runtime-4.3.0-nepomuk-autostart.patch DELETED ---


--- kdebase-runtime-4.3.1-backend-globalconfig.patch DELETED ---


--- kdebase-runtime-4.3.4-kde#202744.patch DELETED ---


--- kdebase-runtime-4.3.4-kde#210463.patch DELETED ---

