From 05b974d6dc41614271cc4b86fe94d0a98fa81b76 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Dec 01 2008 15:07:46 +0000
Subject: - fix up %description

- versioned Obsoletes
- scriptlets fixes
- BR: plasma-devel

---

diff --git a/kdenetwork.spec b/kdenetwork.spec
index d7fc783..3be560f 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -1,5 +1,3 @@
-# FIXME/TODO: needed BuildRequires
-# Decibel
 
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
@@ -11,21 +9,16 @@ License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
-
-# upstream patches
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
-BuildRequires: cmake >= 2.6.2
-# TODO
+# FIXME/TODO
 #BuildRequires: decibel-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libidn-devel
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
@@ -34,6 +27,7 @@ BuildRequires: openldap-devel
 BuildRequires: openslp-devel
 BuildRequires: pcre-devel
 BuildRequires: qca2-devel
+BuildRequires: plasma-devel >= %{version}
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.0.97
 BuildRequires: sqlite-devel
@@ -42,7 +36,7 @@ BuildRequires: sqlite-devel
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 # kopete/yahoo
 Requires(hint): jasper
@@ -53,14 +47,11 @@ Requires: ppp
 ## krdc
 Requires(hint): rdesktop
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 7:4.0.0 
 
-# FIXME/TODO: Taken from 3.5.8. review needed
 %description
 Networking applications, including:
 * kget: downloader manager
-* kio_lan: lan browsing kio slave
-* knewsticker: RDF newsticker applet
 * kopete: chat client
 * kppp: dialer and front end for pppd
 * krdc: a client for Desktop Sharing and other VNC servers
@@ -104,10 +95,14 @@ rm -rf %{buildroot}
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+/sbin/ldconfig ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 
@@ -118,6 +113,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_kde4_bindir}/*
+%{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
 %{_kde4_appsdir}/kopete*
@@ -126,6 +122,7 @@ rm -rf %{buildroot}
 %{_kde4_appsdir}/krdc/
 %{_kde4_appsdir}/remoteview/
 %{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
+%{_kde4_configdir}/kopeterc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
@@ -134,31 +131,35 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/sounds/*
 %{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_configdir}/kopeterc
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/kconf_update/*
 %{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/libqgroupwise.so
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libqgroupwise.so
 %{_kde4_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_kde4_includedir}/*
+%{_kde4_includedir}/kopete/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 
 
 %changelog
-* Fri Nov 28 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 7:4.1.80-3
+* Mon Dec 01 2008 Rex Dieter <rdieter@fedoraproject.org> 7:4.1.80-4
+- fix up %%description
+- versioned Obsoletes
+- scriptlets fixes
+- BR: plasma-devel
+
+* Fri Nov 28 2008 Lorenzo Villani <lvillani@binaryhelix.net> 7:4.1.80-3
 - fix build (updated file lists)
 
 * Thu Nov 20 2008 Than Ngo <than@redhat.com> 4.1.80-2
 - merged
 
-* Thu Nov 20 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 7:4.1.72-1
+* Thu Nov 20 2008 Lorenzo Villani <lvillani@binaryhelix.net> 7:4.1.72-1
 - 4.1.80
 - BR cmake 2.6
 - make install/fast