rpms/kdenetwork/devel kdenetwork.spec, 1.210, 1.211 kdenetwork-4.3.0-jabber-kde#111537.patch, 1.1, NONE kdenetwork-4.3.4-webkitkde.patch, 1.1, NONE

[Ben Boeckel]

Author: mathstuf

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

Modified Files:
	kdenetwork.spec 
Removed Files:
	kdenetwork-4.3.0-jabber-kde#111537.patch 
	kdenetwork-4.3.4-webkitkde.patch 
Log Message:
Update to 4.3.75


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- kdenetwork.spec	19 Nov 2009 13:15:20 -0000	1.210
+++ kdenetwork.spec	24 Nov 2009 16:57:55 -0000	1.211
@@ -1,25 +1,20 @@
+%define alphatag svn1048496
 
 Summary: K Desktop Environment - Network Applications
 Name: kdenetwork
 Epoch: 7
-Version: 4.3.3
-Release: 6%{?dist}
+Version: 4.3.75
+Release: 0.1.%{alphatag}%{?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
-Source1: krdc-icons.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}%{?alphatag}.tar.bz2
+#Source1: krdc-icons.tar.bz2
 
 ## upstream me!  -- Rex :)
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
-# upstream patches (4.3 branch):
-Patch100: kdenetwork-4.3.4-webkitkde.patch
-
-# upstream patches (4.4 branch):
-Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora}
@@ -35,12 +30,16 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
+BuildRequires: gpgme-devel
 BuildRequires: kdelibs-experimental-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: libidn-devel
 BuildRequires: libmsn-devel >= 4.0-0.4.beta2
 BuildRequires: libvncserver-devel
-BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: libxslt-devel
+BuildRequires: libxml2-devel
+# FIXME: 2.1.1 in rawhide
+BuildRequires: linphone-devel >= 2.3.0
 BuildRequires: meanwhile-devel
 BuildRequires: openldap-devel
 BuildRequires: ortp-devel
@@ -98,15 +97,10 @@ Requires: kdelibs4-devel
 
 
 %prep
-%setup -q -a 1
+#setup -q -a 1 -n kdenetwork-%{version}%{?alphatag}
+%setup -q -n kdenetwork-%{version}%{?alphatag}
 %patch1 -p1 -b .icon
 
-# 4.3 upstream patches
-chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
-%patch100 -p0 -b .webkitkde
-
-# 4.4 upstream patches
-%patch200 -p0 -b .bz#515586-kopete
 
 %build
 mkdir -p %{_target_platform}
@@ -168,11 +162,12 @@ fi
 %{_kde4_appsdir}/krfb/
 %{_kde4_appsdir}/krdc/
 %{_kde4_appsdir}/remoteview/
-%{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
+#{_kde4_appsdir}/desktoptheme/default/widgets/kget.svg
 %{_kde4_configdir}/kopeterc
 %{_kde4_datadir}/applications/kde4/*
 %{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
+%{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
@@ -180,7 +175,7 @@ fi
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_libdir}/kde4/*.so
-%{_libdir}/mozilla/plugins/libskypebuttons.so
+%{_libdir}/mozilla/plugins/skypebuttons.so
 
 %files libs
 %defattr(-,root,root,-)
@@ -191,11 +186,15 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_includedir}/kopete/
 %{_kde4_includedir}/krdc/
+%{_kde4_includedir}/KRfb/
 %{_kde4_libdir}/lib*.so
 %exclude %{_kde4_libdir}/libqgroupwise.so
 
 
 %changelog
+* Mon Nov 23 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.75-0.1.svn1048496
+- Update to 4.3.75 snapshot
+
 * Thu Nov 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-6
 - rebuild (for qt-4.6.0-rc1, f13+)
 


--- kdenetwork-4.3.0-jabber-kde#111537.patch DELETED ---


--- kdenetwork-4.3.4-webkitkde.patch DELETED ---