rpms/kdebase/F-9 kdebase.spec,1.328,1.329

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12211

Modified Files:
	kdebase.spec 
Log Message:
* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
- 4.0.99



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- kdebase.spec	2 Jul 2008 14:46:53 -0000	1.328
+++ kdebase.spec	23 Jul 2008 12:28:48 -0000	1.329
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Core Files
-Version: 4.0.5
-Release: 5%{?dist}
+Version: 4.0.99
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -22,24 +22,13 @@
 License: GPLv2
 Group: User Interface/Desktops
 URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # fedora specific nsplugins paths
 Patch1:   kdebase-nsplugins-paths.patch
 
 ## upstream patches
-# fix Konsole window size (backported from 4.1, #439638, kde#160422)
-# http://websvn.kde.org/?view=rev&revision=793964
-# http://websvn.kde.org/?view=rev&revision=793970
-Patch100: kdebase-4.0.3-kde#160422.patch
-# http://bugzilla.redhat.com/438786 (upstreamed -- Rex)
-Patch102: kdebase-4.0.3-kwrite-dt_categories.patch
-# backporte from 4.1
-Patch103: kdebase-4.0.4-konqueror-updatehistoryentry.patch
-Patch104: kdebase-4.0.5-konq-memleak.patch
-#Â Avoid lockup after a failed login on LDAP systems (kdebug:161377)
-Patch105: kdebase-4.0.5-kdepasswd-ldap.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -75,12 +64,16 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
+%if "%{name}" == "kdebase"
+BuildRequires: kdebase-workspace-devel >= %{version}
+%endif
 %ifnarch s390 s390x
 BuildRequires: libraw1394-devel
 BuildRequires: libusb-devel
 %endif
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
+BuildRequires: pciutils-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
 BuildRequires: qimageblitz-devel
@@ -90,11 +83,12 @@
 %else
 BuildRequires: samba
 %endif
-BuildRequires: soprano-devel
-BuildRequires: strigi-devel
+BuildRequires: soprano-devel >= 2.0.97
+BuildRequires: strigi-devel >= 0.5.7
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: glib2-devel
 
 # Dolphin needs the ioslaves and icons from kdebase-runtime (#438632)
 Requires: kdebase-runtime oxygen-icon-theme
@@ -130,22 +124,15 @@
 
 %prep
 %setup -q -n kdebase-%{version}
-
 %patch1   -p0 -b .nsplugins-paths
-%patch100 -p0 -b .kde#160422
-%patch102 -p1 -b .kwrite-dt_categories
-%patch103 -p1 -b .konqueror-updatehistoryentry
-%patch104 -p1 -b .konq-memleak
-%patch105 -p1 -b .kdepasswd-ldap
 
 %build
-
 mkdir -p %{_target_platform} 
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -315,31 +302,51 @@
 
 
 %changelog
-* Wed Jul  2 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-5
-- Avoid lockup after a failed login on LDAP systems (kdebug:161377)
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.99-1
+- 4.0.99
+
+* Fri Jul 11 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.98-2
+- BR: pciutils-devel
 
-* Tue Jun 24 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.5-4
+* 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
+
+* Tue Jun 24 2008 Lukáš Tinkl <ltinkl at redhat.com> - 4.0.83-2
 - #426108: Add more directories to konqueror's default
   plugin search path list
 
-* Thu Jun 05 2008 Than Ngo <than at redhat.com> - 4.0.5-3
-- backport to fix memleak
+* Thu Jun 19 2008 Than Ngo <than at redhat.com> 4.0.83-1
+- 4.0.83 (beta2)
+
+* Mon Jun 16 2008 Than Ngo <than at redhat.com> 4.0.82-2
+- BR kdebase-workspace-devel (F9+)
+
+* Sun Jun 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.82-1
+- 4.0.82
 
-* Tue Jun 03 2008 Than Ngo <than at redhat.com> - 4.0.5-2
+* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-3
 - respun tarball from upstream
 
-* Sun Jun 01 2008 Than Ngo <than at redhat.com> 4.0.5-1
-- 4.0.5
+* Tue May 27 2008 Than Ngo <than at redhat.com> 4.0.80-2
+- rebuild to fix undefined symbol issue in dolphin
 
-* Sat May 24 2008 Than Ngo <than at redhat.com> 4.0.4-3
-- backport konqueror crash fix from trunk
+* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
+- 4.1 beta1
 
-* Sun May 11 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.4-2
+* Sun May 11 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.72-2
 - quote semicolon in fix for #442834
 - only do the echo when konquerorsu.desktop is actually shipped (#445989)
 
-* 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 backported kde#160422 and nspluginviewer patches
+- add minimum versions to soprano-devel and strigi-devel BRs
 
 * Fri Apr 18 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.3-9
 - kwrite.desktop: Categories += Utility (#438786)