From 379013eebc8dce2ce3400ac49182037445334359 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 22 Jan 2009 11:18:31 +0000 Subject: [PATCH] 4.2.0 --- .cvsignore | 1 + kdelibs.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index e582aef..829565d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ kdelibs-4.1.85.tar.bz2 kdelibs-4.1.96.tar.bz2 +kdelibs-4.2.0.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index 94e85f0..08e0837 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,6 +1,6 @@ Summary: K Desktop Environment 4 - Libraries -Version: 4.1.96 -Release: 9%{?dist} +Version: 4.2.0 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -17,7 +17,7 @@ Name: kdelibs4 License: LGPLv2 URL: http://www.kde.org/ Group: System Environment/Libraries -Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdelibs-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %ifarch noarch @@ -79,8 +79,6 @@ Patch20: kdelibs-4.1.70-cmake.patch Patch22: kdelibs-4.1.96-cmake.patch # upstream -# 4.2 branch -Patch100: kdelibs-4.1.96-crash.patch # 4.3 branch Patch101: kdelibs-4.1.96-AllowExternalPaths.patch @@ -209,7 +207,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch22 -p1 -b .kdepimlibs-cmake # upstream patches -%patch100 -p1 -b .crash %patch101 -p1 -b .AllowExternalPaths %build @@ -372,6 +369,9 @@ rm -rf %{buildroot} %changelog +* Thu Jan 22 2009 Than Ngo - 4.2.0-1 +- 4.2.0 + * Fri Jan 16 2009 Than Ngo - 4.1.96-9 - drop kdelibs-4.1.85-plasma-default-wallpaper.patch, it's not needed since new plasma allows to define default wallpaper, new kde-setting diff --git a/sources b/sources index 6146380..5725984 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9254b5afda5bf1855b8d381b6d4509b kdelibs-4.1.96.tar.bz2 +c5ba7a8a99302bfe2c70503aa621f703 kdelibs-4.2.0.tar.bz2