rpms/kdebase/devel kdebase.spec,1.386,1.387

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25181

Modified Files:
	kdebase.spec 
Log Message:
* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
- kde-plasma-folderview subpkg
- %?_isa'ify -libs deps



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- kdebase.spec	29 Jul 2009 22:17:30 -0000	1.386
+++ kdebase.spec	25 Aug 2009 17:40:36 -0000	1.387
@@ -1,7 +1,8 @@
+
 Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 6
 
 License: GPLv2
@@ -24,9 +25,9 @@ Provides:  kdebase4 = %{version}-%{relea
 Obsoletes: dolphin < 1.0.2-1
 Obsoletes: d3lphin
 Obsoletes: kdebase4 < %{version}-%{release}
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 6:4.0.0 
 
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # FIXME: remove BRs which are only needed for stuff now in -runtime
 BuildRequires: alsa-lib-devel
@@ -73,22 +74,26 @@ Requires: kdebase-runtime
 Core runtime requirements and applications for the K Desktop Environment 4.
 
 
+%package -n kde-plasma-folderview
+Summary: FolderView plasma applet
+Group:   System Environment/Desktop
+%description -n kde-plasma-folderview
+%{summary}.
 
 %package libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
+Requires: kdelibs4%{?_isa} >= %{version}
+Requires: kdepimlibs%{?_isa} >= %{version}
 %description libs
 %{summary}.
 
-
-
 %package devel
 Group:    Development/Libraries
 Summary:  Development files for %{name}
 Provides:  kdebase4-devel = %{version}-%{release}
 Obsoletes: kdebase4-devel < %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kdelibs4-devel kdepimlibs4-devel
 %description devel
 %{summary}.
@@ -146,7 +151,6 @@ rm -rf %{buildroot}
 
 
 %post
-%{!?libs:/sbin/ldconfig}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
@@ -156,41 +160,52 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 update-desktop-database -q &> /dev/null ||:
 
 %postun
-%{!?libs:/sbin/ldconfig}
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
-    touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
-    update-desktop-database -q &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
+  update-desktop-database -q &> /dev/null ||:
 fi
 
 %post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
-%{_kde4_datadir}/applications/kde4/*
+%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_datadir}/kde4/services/*
-%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/
+%{_kde4_datadir}/kde4/services/kded/*.desktop
+%{_kde4_datadir}/kde4/services/useragentstrings/
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_docdir}/HTML/en/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_mandir}/man1/*
-%{_kde4_datadir}/autostart/*
+%{_kde4_datadir}/autostart/*.desktop
 %{_kde4_configdir}/*
 %{_kde4_datadir}/templates/*
 %{_kde4_datadir}/templates/.source/*
-%{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/libkonsoleprivate.so
 
+%exclude %{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%exclude %{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
+%files -n kde-plasma-folderview
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop
+%{_kde4_libdir}/kde4/plasma_applet_folderview.so
+
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/lib*.so.*
@@ -202,6 +217,10 @@ fi
 
 
 %changelog
+* Tue Aug 25 2009 Rex Dieter <rdieter at fedoraproject.org> 4.3.0-2
+- kde-plasma-folderview subpkg
+- %%?_isa'ify -libs deps
+
 * Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
 - 4.3.0