diff --git a/.cvsignore b/.cvsignore index 8f7fca3..3f85093 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ +kdenetwork-4.4.2.tar.bz2 krdc-icons.tar.bz2 -kdenetwork-4.4.1.tar.bz2 diff --git a/kdenetwork-4.4.2-qt47.patch b/kdenetwork-4.4.2-qt47.patch new file mode 100644 index 0000000..f14d306 --- /dev/null +++ b/kdenetwork-4.4.2-qt47.patch @@ -0,0 +1,12 @@ +diff -up kdenetwork-4.4.2/kget/core/transfergroup.cpp.qt47 kdenetwork-4.4.2/kget/core/transfergroup.cpp +--- kdenetwork-4.4.2/kget/core/transfergroup.cpp.qt47 2010-01-06 11:01:03.000000000 -0600 ++++ kdenetwork-4.4.2/kget/core/transfergroup.cpp 2010-04-01 15:37:09.058355292 -0500 +@@ -31,7 +31,7 @@ TransferGroup::TransferGroup(TransferTre + m_percent(0), m_downloadSpeed(0), m_uploadSpeed(0), + m_downloadLimit(0), m_uploadLimit(0), + m_visibleDownloadLimit(0), m_visibleUploadLimit(0), +- m_iconName("bookmark-new-list"), m_defaultFolder(0) ++ m_iconName("bookmark-new-list"), m_defaultFolder() + { + m_handler = new TransferGroupHandler(parent, this); + } diff --git a/kdenetwork.spec b/kdenetwork.spec index b93f7d4..76fd451 100644 --- a/kdenetwork.spec +++ b/kdenetwork.spec @@ -2,13 +2,15 @@ Summary: KDE Network Applications Name: kdenetwork Epoch: 7 -Version: 4.4.1 +Version: 4.4.2 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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + Source1: krdc-icons.tar.bz2 ## upstream me! -- Rex :) @@ -16,7 +18,8 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patch # rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf Patch2: kdenetwork-4.3.3-resolv-conf-path.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +## upstream patches +Patch100: kdenetwork-4.4.2-qt47.patch %if 0%{?fedora} BuildRequires: avahi-compat-libdns_sd-devel @@ -102,6 +105,7 @@ Requires: kdelibs4-devel %setup -q -a 1 -n kdenetwork-%{version}%{?alphatag} %patch1 -p1 -b .icon %patch2 -p1 -b .resolv-conf-path +%patch100 -p1 -b .qt47 %build @@ -192,6 +196,9 @@ fi %changelog +* Mon Mar 29 2010 Lukas Tinkl - 7:4.4.2-1 +- 4.4.2 + * Sat Feb 27 2010 Rex Dieter - 7:4.4.1-1 - 4.4.1 diff --git a/sources b/sources index 4bf7ca3..dcdd506 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +079fe0c9b7d7c5b52e673b5f4bc4f301 kdenetwork-4.4.2.tar.bz2 7dd360a790100c952090410c2c89937c krdc-icons.tar.bz2 -e1a0da88d27feb7c921a26c0dc9782b7 kdenetwork-4.4.1.tar.bz2