rpms/kdebase/F-11 .cvsignore, 1.92, 1.93 kdebase.spec, 1.390, 1.391 sources, 1.116, 1.117 kdebase-4.3.3-konsole-kde#177637.patch, 1.1, NONE kdebase-4.3.5-webkitkde002.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

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

Modified Files:
	.cvsignore kdebase.spec sources 
Removed Files:
	kdebase-4.3.3-konsole-kde#177637.patch 
	kdebase-4.3.5-webkitkde002.patch 
Log Message:
KDE 4.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/.cvsignore,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- .cvsignore	26 Jan 2010 15:05:24 -0000	1.92
+++ .cvsignore	10 Feb 2010 13:56:03 -0000	1.93
@@ -1 +1 @@
-kdebase-4.3.5.tar.bz2
+kdebase-4.4.0.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -p -r1.390 -r1.391
--- kdebase.spec	1 Feb 2010 17:59:37 -0000	1.390
+++ kdebase.spec	10 Feb 2010 13:56:03 -0000	1.391
@@ -1,28 +1,23 @@
-Name: kdebase
-Summary: K Desktop Environment 4 - Core Files
-Epoch: 6
-Version: 4.3.5
-Release: 3%{?dist}
+
+Name:    kdebase
+Summary: KDE Core Files
+Epoch:   6
+Version: 4.4.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
-# revert revision 1071180 to build with webkitkde 0.0.2
-Patch3:   kdebase-4.3.5-webkitkde002.patch
 
-# 4.4 (backported from trunk) upstream patches
-# Allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
-# http://websvn.kde.org/?revision=1033653&view=revision
-Patch100: kdebase-4.3.3-konsole-kde#177637.patch
+## upstream patches
 # remove extra spaces from konsole selections, https://bugzilla.redhat.com/560721
-Patch101: kdebase-4.3.95-konsole-extra-spaces.patch
+Patch100: kdebase-4.3.95-konsole-extra-spaces.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -67,11 +62,9 @@ BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
 # samba support
 BuildRequires: libsmbclient-devel
+BuildRequires: shared-desktop-ontologies-devel
 BuildRequires: soprano-devel 
 BuildRequires: strigi-devel 
-%if 0%{?fedora}
-BuildRequires: webkitpart-devel >= 0.0.2
-%endif
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -81,7 +74,7 @@ BuildRequires: glib2-devel
 Requires: kdebase-runtime
 
 %description
-Core runtime requirements and applications for the K Desktop Environment 4.
+Core runtime requirements and applications for KDE 4.
 
 %package -n kde-plasma-folderview
 Summary: FolderView plasma applet
@@ -111,18 +104,12 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 
 
 %prep
-%setup -q -n kdebase-%{version}
+%setup -q -n kdebase-%{version}%{?alphatag}
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
-%patch3 -p0 -b .webkitkde002
-
-# 4.4 (backported from trunk) upstream patches
-%patch100 -p0 -b .konsole-kde#177637
-%patch101 -p1 -b .konsole-extra-spaces
 
-# fix incorrect assumption that we're building in a combined kdebase tree
-sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
+%patch100 -p1 -b .konsole-extra-spaces
 
 
 %build
@@ -241,17 +228,44 @@ fi
 
 
 %changelog
-* Mon Feb 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-3
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 6:4.4.0-1
+- 4.4.0
+
+* Mon Feb 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-2
 - remove extra spaces from konsole selections (#560721)
 
-* Tue Jan 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.5-2
-- revert revision 1071180 to build with webkitkde 0.0.2
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
+
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.90 (4.4rc1)
+
+* 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 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+- rebuild against Nepomuk-enabled kdelibs
+
+* Wed Dec 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.80-2
+- BR: shared-desktop-ontologies-devel
+
+* Tue Dec 01 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+
+* Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.2.svn1048496
+- Fix webkitkde version requirement
 
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
-- 4.3.5
+* Sun Nov 22 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
+* Thu Nov 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-4
+- rebuild (for qt-4.6.0-rc1, f13+)
 
 * Wed Nov 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
 - allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-11/sources,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- sources	26 Jan 2010 15:05:24 -0000	1.116
+++ sources	10 Feb 2010 13:56:03 -0000	1.117
@@ -1 +1 @@
-8780164dc328992cfbd9a6d5c9e8a8f5  kdebase-4.3.5.tar.bz2
+ddfc358aebe5dc8f5de6f5d1ff7cb018  kdebase-4.4.0.tar.bz2


--- kdebase-4.3.3-konsole-kde#177637.patch DELETED ---


--- kdebase-4.3.5-webkitkde002.patch DELETED ---