rpms/kdenetwork/F-10 kdenetwork.spec,1.161,1.162

Sat Jan 24 17:45:40 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6186

Modified Files:
	kdenetwork.spec 
Log Message:
* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
- 4.2.0



Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162

--- kdenetwork.spec	12 Jan 2009 18:40:24 -0000	1.161
+++ kdenetwork.spec	24 Jan 2009 17:45:09 -0000	1.162
@@ -1,61 +1,51 @@
-# FIXME/TODO: needed BuildRequires 
-# Decibel
-
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.1.4
-Release: 2%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
 URL: http://www.kde.org
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch0: kdenetwork-4.1.3-handle-enc-message.patch
 # build Kopete against the system libgadu (backported from 4.3)
 # http://websvn.kde.org/?view=rev&revision=909144
 # http://websvn.kde.org/?view=rev&revision=909145
-Patch100: kdenetwork-4.1.4-system-libgadu.patch
-
-# upstream patches
-
+Patch100: kdenetwork-4.1.96-system-libgadu.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: avahi-compat-libdns_sd-devel
 BuildRequires: boost-devel
-BuildRequires: cmake
-# TODO
+# FIXME/TODO
 #BuildRequires: decibel-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kde-filesystem >= 4
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdebase-workspace-devel >= %{version}
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: libidn-devel
+BuildRequires: libmsn-devel >= 4.0-0.4.beta2
 BuildRequires: libotr-devel
 BuildRequires: libvncserver-devel
 BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: meanwhile-devel
 BuildRequires: openldap-devel
 BuildRequires: openslp-devel
+BuildRequires: ortp-devel
 BuildRequires: pcre-devel
 BuildRequires: qca2-devel
+BuildRequires: plasma-devel >= %{version}
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel >= 2.0.97
+BuildRequires: speex-devel
 BuildRequires: sqlite-devel
-# omit for now, save pulling in xmms-lib, gtk+ lib stack
-#BuildRequires: xmms-devel 
-
+# FIXME/TODO: libnxcl-devel
 
 # FIXME/TODO: are there other explicit Requires?
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
-Requires: kdelibs4 >= %{version}
 Requires: kdepimlibs >= %{version}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 # kopete/yahoo
 Requires(hint): jasper
@@ -66,14 +56,15 @@
 ## krdc
 Requires(hint): rdesktop
 
-Obsoletes: %{name}-extras < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-extras < 7:4.0.0 
+
+# kopete-bonjour review, https://bugzilla.redhat.com/451302
+Obsoletes: kopete-bonjour < 2
+Provides: kopete-bonjour = 2
 
-# 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
@@ -87,7 +78,7 @@
 
 %package devel
 Group:    Development/Libraries
-Summary:  Development files for %{name} 
+Summary:  Development files for %{name}
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: kdelibs4-devel
 %description devel
@@ -96,8 +87,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .handle-enc-message
-%patch100 -p1 -b .system-libgadu
+%patch100 -p0 -b .system-libgadu
 rm -rf kopete/protocols/gadu/libgadu/
 
 %build
@@ -112,7 +102,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %clean
@@ -120,10 +110,14 @@
 
 
 %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
 
@@ -134,6 +128,7 @@
 %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*
@@ -141,46 +136,74 @@
 %{_kde4_appsdir}/krfb/
 %{_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/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
-%{_kde4_docdir}/HTML/en/kget/
-%{_kde4_docdir}/HTML/en/knewsticker/
-%{_kde4_docdir}/HTML/en/kopete/
-%{_kde4_docdir}/HTML/en/kppp/
-%{_kde4_docdir}/HTML/en/krfb/
-%{_kde4_docdir}/HTML/en/krdc/
+%{_kde4_docdir}/HTML/en/*/
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_configdir}/kopeterc
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/kconf_update/*
-%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
 %{_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
-* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.4-2
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-3
+- rebuild for new OpenSSL
+
+* Mon Jan 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.96-2
 - build against system libgadu (trivial patch backported from 4.3)
 
-* Fri Jan  9 2009 LukÃ¡Å¡ Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
 
-* Wed Dec 10 2008 Jaroslav Reznik <jreznik at redhat.com> 4.1.3-2
-- fix kopete jabber protocol encrypted message handling (#473412)
+* Fri Dec 12 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+- BR: libmsn-devel
+
+* Thu Dec 11 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-7
+- Obsoletes/Provides: kopete-bonjour (#451302)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-6
+- rebuild for fixed kde-filesystem (macros.kde4) (get rid of rpaths)
+
+* Thu Dec 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.1.80-5
+- add missing BR meanwhile-devel (#474592)
+- add missing BR ortp-devel and speex-devel (for Jingle protocol)
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> 7:4.1.80-4
+- fix up %%description
+- versioned Obsoletes
+- scriptlets fixes
+- BR: plasma-devel
+
+* Fri Nov 28 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.80-3
+- fix build (updated file lists)
+
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Thu Nov 20 2008 Lorenzo Villani <lvillani at binaryhelix.net> 7:4.1.72-1
+- 4.1.80
+- BR cmake 2.6
+- make install/fast
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
 - 4.1.3
@@ -279,7 +302,7 @@
 - Obsoletes: -extras ...
 - Requires: rdesktop (#420801), for krdc
 - Requires: ppp , for kppp
-- Requires: jasper , for kopete 
+- Requires: jasper , for kopete
 
 * Wed Dec 12 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
 - rebuild for changed _kde4_includedir


