rpms/kdebase4/F-8 .cvsignore, 1.4, 1.5 kdebase4.spec, 1.7, 1.8 sources, 1.4, 1.5

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16472/F-8

Modified Files:
	.cvsignore kdebase4.spec sources 
Log Message:
Sync from kdebase/devel:

* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-2
- respun tarball

* Mon Jan 07 2008 Than Ngo <than at redhat.com> 4.0.0-1
- 4.0.0

* Tue Dec 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
- Obsoletes: dolphin, d3lphin, Provides: dolphin (F9+)

* Fri Dec 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-4
- Obsoletes: -extras (f9+)

* Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
- rebuild for changed _kde4_includedir

* Sun Dec 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
- rm konsoleprofile when building as kdebase4, does nothing with KDE 3 konsole

* Thu Dec 06 2007 Than Ngo <than at redhat.com> 3.97.0-1
- update to 3.97.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Dec 2007 02:34:32 -0000	1.4
+++ .cvsignore	10 Jan 2008 23:52:44 -0000	1.5
@@ -1 +1 @@
-kdebase-3.96.2.tar.bz2
+kdebase-4.0.0.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/kdebase4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdebase4.spec	3 Dec 2007 02:34:32 -0000	1.7
+++ kdebase4.spec	10 Jan 2008 23:52:44 -0000	1.8
@@ -1,7 +1,7 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.96.2
-Release:       1%{?dist}
+Version:       4.0.0
+Release:       2%{?dist}
 
 %if 0%{?fedora} > 8
 Name:          kdebase
@@ -10,6 +10,8 @@
 Obsoletes:     kdebase4 < %{version}-%{release}
 Provides:      kdebase4 = %{version}-%{release}
 
+Obsoletes:     %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+
 %else
 Name:          kdebase4
 %endif
@@ -17,7 +19,7 @@
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
-Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
+Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde-filesystem >= 4
@@ -31,8 +33,14 @@
 Requires: eject
 %endif
 
+%if 0%{fedora} >= 9
+Provides:      dolphin = 0.9.5-1
+Obsoletes:     dolphin < 0.9.5-1
+Obsoletes:     d3lphin
+%else
 # should not conflict with d3lphin, but does with old Dolphin
 Conflicts:     dolphin <= 0.8.2
+%endif
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -192,6 +200,8 @@
 rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/Home.desktop
 rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/k*.desktop
 rm -f %{buildroot}%{_kde4_datadir}/applications/kde4/quick-access-konsole.desktop
+# and this doesn't work with KDE 3 konsole
+rm -f %{buildroot}%{_kde4_bindir}/konsoleprofile
 %endif
 
 # move devel symlinks
@@ -257,7 +267,6 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %endif
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
@@ -265,6 +274,27 @@
 
 
 %changelog
+* Tue Jan 08 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0.0-2
+- respun tarball
+
+* Mon Jan 07 2008 Than Ngo <than at redhat.com> 4.0.0-1
+- 4.0.0
+
+* Tue Dec 25 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
+- Obsoletes: dolphin, d3lphin, Provides: dolphin (F9+)
+
+* Fri Dec 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-4
+- Obsoletes: -extras (f9+)
+
+* Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
+- rebuild for changed _kde4_includedir
+
+* Sun Dec 09 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
+- rm konsoleprofile when building as kdebase4, does nothing with KDE 3 konsole
+
+* Thu Dec 06 2007 Than Ngo <than at redhat.com> 3.97.0-1
+- update to 3.97.0
+
 * Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-1
 - merge changes from Sebastian Vahl's version:
   - update to 3.96.2, remove beta warnings


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Dec 2007 02:34:32 -0000	1.4
+++ sources	10 Jan 2008 23:52:44 -0000	1.5
@@ -1 +1 @@
-590e9d99f96b85f008e5aa327c17ac2a  kdebase-3.96.2.tar.bz2
+01d8f2f16cbd4e225efc996b0dd39769  kdebase-4.0.0.tar.bz2