From 891f1ecd01f2082a99d9c80a5c68b4f7dfe5de1a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 25 Jan 2007 14:07:12 +0000 Subject: [PATCH] 3.5.6 --- .cvsignore | 1 + kdelibs.spec | 21 +++++---------------- sources | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1427b71..6a24dd8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -12,3 +12,4 @@ kdelibs-3.5.1.tar.bz2 kdelibs-3.5.2.tar.bz2 kdelibs-3.5.3.tar.bz2 kdelibs-3.5.4.tar.bz2 +kdelibs-3.5.6.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index 9d8ffcb..0c1ab60 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,4 +1,4 @@ -%define distname "Fedora-Core" +%define distname "Fedora" %define debug 0 %define final 1 @@ -16,7 +16,7 @@ %define make_cvs 0 %define arts 1 -Version: 3.5.5 +Version: 3.5.6 Release: 1%{?dist} Summary: K Desktop Environment - Libraries Name: kdelibs @@ -46,13 +46,6 @@ Patch38: kdelibs-3.5.2-cupsdconf2-group.patch Patch39: kdelibs-3.5.4-kabc-make.patch Patch40: kdelibs-3.5.4-kdeprint-utf8.patch -# upstream patches -Patch100: kdelibs-3.5.5-kmcupsmanager.patch -Patch101: kdelibs-3.5.5-kde#135988.patch - -# security fixes -Patch500: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch - Requires: arts >= %{arts_epoch}:%{arts_version} Requires: qt >= %{qt_epoch}:%{qt_version} Requires: cups-libs >= %{cups_epoch}:1.1.12 @@ -175,13 +168,6 @@ format for easy browsing %patch39 -p1 -b .kabc-make %patch40 -p1 -b .kdeprint-utf8 -# upstream pathces -%patch100 -p1 -b .kmcupsmanager -%patch101 -p0 -b .kde#135988 - -# security fixes -%patch500 -p1 -b .CVE-2006-4811 - perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h %build @@ -397,6 +383,9 @@ fi %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Thu Jan 25 2007 Than Ngo - 6:3.5.5-1.fc7 +- 3.5.6 + * Tue Nov 14 2006 Than Ngo - 6:3.5.5-1.fc7 - rebuild diff --git a/sources b/sources index 7ef0e6a..6bf4da4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 +e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2