rpms/kdebase/devel .cvsignore, 1.59, 1.60 kdebase.spec, 1.279, 1.280 sources, 1.80, 1.81

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Dec 1 22:58:13 UTC 2007 

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2461/devel

Modified Files:
	.cvsignore kdebase.spec sources 
Log Message:
- merge changes from Sebastian Vahl's version:
  - update to 3.96.2, remove beta warnings
  - BR: kde-filesystem >= 4
  - only remove conflicts when building as kdebase4, update file list
  - run xdg-icon-resource forceupdate for hicolor when building as kdebase
- make this the default kdebase for F9 again


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	24 Oct 2007 13:54:58 -0000	1.59
+++ .cvsignore	1 Dec 2007 22:57:14 -0000	1.60
@@ -1,37 +1 @@
-kde-redhat-config-3.2.0-0.2.tar.bz2
-kdebase-3.3.0.tar.bz2
-kde-redhat-config-3.2.0-0.3.tar.bz2
-kdebase-3.3.1.tar.bz2
-kde-redhat-config-3.2.0-0.4.tar.bz2
-kde-redhat-config-3.2.0-0.5.tar.bz2
-kde-redhat-config-3.2.0-0.6.tar.bz2
-kdebase-3.3.2.tar.bz2
-kdebase-3.4.0-rc1.tar.bz2
-kde-redhat-config-3.2.0-0.7.tar.bz2
-kdebase-3.4.0.tar.bz2
-kde-redhat-config-3.2.0-0.8.tar.bz2
-kde-redhat-config-3.2.0-0.9.tar.bz2
-kdebase-3.4.1.tar.bz2
-kdebase-3.4.2.tar.bz2
-kde-redhat-config-3.4.2-fc4-0.1.tar.bz2
-kde-redhat-config-3.4.2-fc4-0.2.tar.bz2
-kdebase-3.4.91.tar.bz2
-kdebase-3.4.92.tar.bz2
-kdebase-3.5.0.tar.bz2
-kde-redhat-config-3.5-fc5-0.1.tar.bz2
-kdebase-3.5.1.tar.bz2
-kde-redhat-config-3.5-fc5-0.2.tar.bz2
-kdebase-3.5.2.tar.bz2
-kdebase-3.5.3.tar.bz2
-kde-redhat-config-3.5-fc5-0.3.tar.bz2
-kdebase-3.5.4.tar.bz2
-kde-redhat-config-3.5-fc5-0.4.tar.bz2
-kde-redhat-config-3.5-fc5-0.5.tar.bz2
-kdebase-3.5.6.tar.bz2
-kde-redhat-config-3.5-fc5-0.6.tar.bz2
-kde-redhat-config-3.5-fc7-1.tar.bz2
-kdebase-3.5.7.tar.bz2
-kdebase-3.5.8.tar.bz2
-cr16-app-package_games_kids.png
-cr32-app-package_games_kids.png
-cr48-app-package_games_kids.png
+kdebase-3.96.2.tar.bz2


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- kdebase.spec	1 Dec 2007 20:00:03 -0000	1.279
+++ kdebase.spec	1 Dec 2007 22:57:14 -0000	1.280
@@ -1,9 +1,9 @@
 
 Summary:       K Desktop Environment 4 - Core Files
-Version:       3.96.0
-Release:       4%{?dist}
+Version:       3.96.2
+Release:       1%{?dist}
 
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 8
 Name:          kdebase
 Epoch:         6
 
@@ -20,7 +20,7 @@
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kde-filesystem
+BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -82,8 +82,6 @@
 Core runtime requirements and applications for the K Desktop Environment 4.
 This package does not include the KDE 4 versions of applications which are
 provided by KDE 3 because of file and configuration setting conflicts.
-WARNING: This is a beta version. It probably has many bugs left.
-Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 %package devel
 Group:    Development/Libraries
@@ -96,8 +94,6 @@
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 Header files for developing applications using %{name}.
-WARNING: This is a beta version. It probably has many bugs left.
-Also, the API and ABI are NOT fully stable yet (soft freeze only).
 
 
 %prep
@@ -122,6 +118,7 @@
 # omit gigantic oxygen scalable/svg icons, for now -- Rex
 find %{buildroot}%{_kde4_iconsdir}/oxygen/scalable -name "*.svgz" | xargs --no-run-if-empty rm -fv 
 
+%if "%{name}" != "kdebase"
 # remove files which conflict with KDE 3
 # FIXME: remove the rm commands for stuff which isn't there to remove in the first place so we see what actually still conflicts
 rm -rf %{buildroot}%{_kde4_iconsdir}/hicolor
@@ -195,6 +192,7 @@
 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
+%endif
 
 # move devel symlinks
 mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
@@ -221,11 +219,17 @@
 %post
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%if "%{name}" == "kdebase"
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
 /sbin/ldconfig ||:
 %{_bindir}/xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%if "%{name}" == "kdebase"
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%endif
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 
@@ -244,6 +248,15 @@
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
 
+%if "%{name}" == "kdebase"
+%{_kde4_datadir}/autostart/*
+%{_kde4_configdir}/*
+%{_kde4_datadir}/templates/*
+%{_kde4_datadir}/templates/.source/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/libkdeinit4_*.so
+%endif
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -252,6 +265,14 @@
 
 
 %changelog
+* 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
+  - BR: kde-filesystem >= 4
+  - only remove conflicts when building as kdebase4, update file list
+  - run xdg-icon-resource forceupdate for hicolor when building as kdebase
+- make this the default kdebase for F9 again
+
 * Mon Nov 19 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.0-4
 - don't list libkdeinit4_*.so, we remove all of them as conflicts
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	24 Oct 2007 13:54:58 -0000	1.80
+++ sources	1 Dec 2007 22:57:14 -0000	1.81
@@ -1,5 +1 @@
-0b4d2328a153d9987562cbf875c5a228  cr16-app-package_games_kids.png
-a2fb4b0bc9b7816bf29b7f2fe52b04c0  cr32-app-package_games_kids.png
-259dd812748a2964f01ca3c3493b72c6  cr48-app-package_games_kids.png
-d52f08756a8d3e9df478506bd258a4d8  kde-redhat-config-3.5-fc7-1.tar.bz2
-9990c669229daaaa8fca4c5e354441fd  kdebase-3.5.8.tar.bz2
+590e9d99f96b85f008e5aa327c17ac2a  kdebase-3.96.2.tar.bz2

More information about the fedora-extras-commits mailing list