rpms/kdebase4/F-7 .cvsignore, 1.5, 1.6 kdebase4.spec, 1.7, 1.8 sources, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdebase4.spec sources 
Log Message:
kde-4.0.1 (sync w/devel)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Jan 2008 23:52:34 -0000	1.5
+++ .cvsignore	7 Feb 2008 18:00:32 -0000	1.6
@@ -1 +1 @@
-kdebase-4.0.0.tar.bz2
+kdebase-4.0.1.tar.bz2


Index: kdebase4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/kdebase4.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdebase4.spec	19 Jan 2008 19:14:24 -0000	1.7
+++ kdebase4.spec	7 Feb 2008 18:00:32 -0000	1.8
@@ -1,38 +1,49 @@
 
-Summary:       K Desktop Environment 4 - Core Files
-Version:       4.0.0
-Release:       2%{?dist}.1
+Summary: K Desktop Environment 4 - Core Files
+Version: 4.0.1
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
-Name:          kdebase
-Epoch:         6
+Name: kdebase
+Epoch: 6
 
-Obsoletes:     kdebase4 < %{version}-%{release}
-Provides:      kdebase4 = %{version}-%{release}
+Obsoletes: kdebase4 < %{version}-%{release}
+Provides: kdebase4 = %{version}-%{release}
 
-Obsoletes:     %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < %{epoch}:%{version}-%{release}
+
+# make -libs subpkg
+%define libs 1
 
 %else
-Name:          kdebase4
+Name: kdebase4
 %endif
 
-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
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
-Requires: kdelibs4 >= %{version}
-Requires: kdepimlibs >= %{version}
-Requires: kdebase-runtime >= %{version}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 %ifnarch s390 s390x
 Requires: eject
 %endif
 
+%if 0%{?libs}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%else
+# are these 2 *really* needed? -- Rex
+Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
+Provides:  %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
 Provides:      dolphin = 0.9.5-1
 Obsoletes:     dolphin < 0.9.5-1
 Obsoletes:     d3lphin
@@ -83,26 +94,41 @@
 
 %description
 Core runtime requirements and applications for the K Desktop Environment 4.
+%if "%{name}" == "kdebase4"
 This package does not include the KDE 4 versions of applications which are
 provided by KDE 3 because of file and configuration setting conflicts.
+%endif
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+# helps multilib upgrades? -- Rex
+Obsoletes: kdebase < %{epoch}:%{version}-%{release}
+# are these 2 *really* needed? -- Rex
+Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+# include to be paranoid, installing libs-only is untested -- Rex
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%description libs
+%{summary}.
+%endif
 
 %package devel
 Group:    Development/Libraries
-Summary:  Header files for kdebase4
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Summary:  Development files for %{name} 
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %if "%{name}" != "kdebase4"
 Obsoletes: kdebase4-devel < %{version}-%{release}
 Provides:  kdebase4-devel = %{version}-%{release}
 %endif
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
-Header files for developing applications using %{name}.
+%{summary}.
 
 
 %prep
 %setup -q -n kdebase-%{version}
 
-
 %build
 
 mkdir -p %{_target_platform} 
@@ -222,7 +248,7 @@
 
 
 %post
-/sbin/ldconfig ||:
+%{!?libs:/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 || :
@@ -230,13 +256,19 @@
 %{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
+%{!?libs:/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 || :
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 
 %files
 %defattr(-,root,root,-)
@@ -249,7 +281,6 @@
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/kde4/*
 %exclude %{_kde4_libdir}/kde4/devel/
 
@@ -262,6 +293,12 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %endif
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_kde4_libdir}/lib*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/*
@@ -269,6 +306,19 @@
 
 
 %changelog
+* Mon Feb 04 2008 Than Ngo <than at redhat.com> 4.0.1-3
+- respin
+
+* Fri Feb 01 2008 Than Ngo <than at redhat.com> 4.0.1-2
+- add flash fix from stable svn branch
+
+* Thu Jan 31 2008 Than Ngo <than at redhat.com> 4.0.1-1
+- 4.0.1
+
+* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.0-3
+- resurrect -libs (f9+)
+- improve %%description
+
 * Sat Jan 19 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.0-2.1
 - Obsoletes: dolphin, d3lphin, Provides: dolphin everywhere
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase4/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	10 Jan 2008 23:52:34 -0000	1.5
+++ sources	7 Feb 2008 18:00:32 -0000	1.6
@@ -1 +1 @@
-01d8f2f16cbd4e225efc996b0dd39769  kdebase-4.0.0.tar.bz2
+c665c4758ac8739ad120c3ca0070136a  kdebase-4.0.1.tar.bz2