rpms/kdenetwork/F-11 .cvsignore, 1.72, 1.73 kdenetwork.spec, 1.201, 1.202 sources, 1.80, 1.81 kdenetwork-4.3.0-jabber-kde#111537.patch, 1.1, NONE kdenetwork-4.3.4-webkitkde.patch, 1.1, NONE

Lukas Tinkl ltinkl at fedoraproject.org
Wed Feb 10 15:16:20 UTC 2010


Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20769/F-11

Modified Files:
	.cvsignore kdenetwork.spec sources 
Removed Files:
	kdenetwork-4.3.0-jabber-kde#111537.patch 
	kdenetwork-4.3.4-webkitkde.patch 
Log Message:
KDE 4.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore	26 Jan 2010 13:11:35 -0000	1.72
+++ .cvsignore	10 Feb 2010 15:16:19 -0000	1.73
@@ -1,2 +1,2 @@
 krdc-icons.tar.bz2
-kdenetwork-4.3.5.tar.bz2
+kdenetwork-4.4.0.tar.bz2


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/kdenetwork.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- kdenetwork.spec	26 Jan 2010 13:11:35 -0000	1.201
+++ kdenetwork.spec	10 Feb 2010 15:16:20 -0000	1.202
@@ -1,8 +1,8 @@
 
-Summary: K Desktop Environment - Network Applications
-Name: kdenetwork
-Epoch: 7
-Version: 4.3.5
+Summary: KDE Network Applications
+Name:    kdenetwork
+Epoch:   7
+Version: 4.4.0
 Release: 1%{?dist}
 
 License: GPLv2
@@ -16,16 +16,10 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patc
 # rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf
 Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
 
-# upstream patches (4.3 branch):
-
-# 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}
 BuildRequires: avahi-compat-libdns_sd-devel
-BuildRequires: webkitpart-devel >= 0.0.2
 BuildRequires: libgadu-devel >= 1.8.0
 BuildRequires: openslp-devel
 BuildRequires: libotr-devel
@@ -36,12 +30,15 @@ BuildRequires: boost-devel
 BuildRequires: giflib-devel
 BuildRequires: glib2-devel
 BuildRequires: gmp-devel
-BuildRequires: kdelibs-experimental-devel >= %{version}
+BuildRequires: gpgme-devel
 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
@@ -99,15 +96,10 @@ Requires: kdelibs4-devel
 
 
 %prep
-%setup -q -a 1
+%setup -q -a 1 -n kdenetwork-%{version}%{?alphatag}
 %patch1 -p1 -b .icon
 %patch2 -p1 -b .resolv-conf-path
 
-# 4.3 upstream patches
-chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
-
-# 4.4 upstream patches
-%patch200 -p0 -b .bz#515586-kopete
 
 %build
 mkdir -p %{_target_platform}
@@ -161,19 +153,16 @@ fi
 %{_kde4_appsdir}/kconf_update/*
 %{_kde4_appsdir}/kget/
 %{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.rc
-%if 0%{?fedora}
-%{_kde4_appsdir}/webkitpart/kpartplugins/kget_plug_in.rc
-%endif
 %{_kde4_appsdir}/kopete*
 %{_kde4_appsdir}/kppp/
 %{_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/*
+%{_datadir}/dbus-1/services/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_datadir}/sounds/*
@@ -181,7 +170,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,-)
@@ -197,15 +186,46 @@ fi
 
 
 %changelog
-* Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
-- 4.3.5
+* Fri Feb 05 2010 Than Ngo <than at redhat.com> - 7:4.4.0-1
+- 4.4.0
+
+* Sun Jan 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.98-1
+- KDE 4.3.98 (4.4rc3)
+
+* Sun Jan 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-2
+- drop webkit support
+
+* Wed Jan 20 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.3.95-1
+- KDE 4.3.95 (4.4rc2)
 
-* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.3.4-1
-- 4.3.4
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-2
+- rebuild (boost)
 
-* Mon Nov 23 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.3-6
+* Wed Jan 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.90-1
+- kde-4.3.90 (4.4rc1)
+
+* Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
+- kde-4.3.85 (4.4beta2)
+
+* Wed Dec 16 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.80-2
+- Repositioning the KDE Brand (#547361)
+
+* Tue Dec  1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.80-1
+- KDE 4.4 beta1 (4.3.80)
+- reenable webkitpart support
+
+* Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.75-0.3.svn1048496
+- disable webkitpart support for now, does not build
+
+* Wed Nov 25 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.3.75-0.2.svn1048496
 - KPPP fix to read resolv.conf from /var/run/ppp (#540433)
 
+* 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+)
+
 * Wed Nov 11 2009 Than Ngo <than at redhat.com> - 4.3.3-5
 - rhel cleanup, drop BR on libotr-devel, openslp-devel, libgadu-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-11/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- sources	26 Jan 2010 13:11:35 -0000	1.80
+++ sources	10 Feb 2010 15:16:20 -0000	1.81
@@ -1,2 +1,2 @@
 7dd360a790100c952090410c2c89937c  krdc-icons.tar.bz2
-e4b9650a0f70daac7f7ba715bf77f14e  kdenetwork-4.3.5.tar.bz2
+a200053df151f17605ffee05f427e959  kdenetwork-4.4.0.tar.bz2


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


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



More information about the scm-commits mailing list