From a3c2fbf0ff800048727487d187b74b4f87c4f3d3 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 23 Nov 2010 22:16:39 +0100 Subject: [PATCH] * Tue Nov 23 2010 Kevin Kofler - 4.5.80-5 - respun tarball (again), includes fix-build patch --- kdelibs-4.5.80-fix-build.patch | 12 ------------ kdelibs.spec | 8 ++++---- sources | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 kdelibs-4.5.80-fix-build.patch diff --git a/kdelibs-4.5.80-fix-build.patch b/kdelibs-4.5.80-fix-build.patch deleted file mode 100644 index b9f3beb..0000000 --- a/kdelibs-4.5.80-fix-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur kdelibs-4.5.80/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp kdelibs-4.5.80-fixed/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp ---- kdelibs-4.5.80/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp 2010-11-22 20:29:30.000000000 +0000 -+++ kdelibs-4.5.80-fixed/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp 2010-11-23 10:37:12.596926002 +0000 -@@ -94,7 +94,7 @@ - int elementYPos = PreviewHeight + ItemMargin + FrameThickness*2; - - //setup rating widget -- KRatingWidget * rating = qobject_cast(widgets.at(DelegateRatingWidget)); -+ KRatingWidget * rating = qobject_cast(widgets.at(DelegateGridRatingWidget)); - if (rating) { - if (entry.rating() > 0) { - rating->setToolTip(i18n("Rating: %1%", entry.rating())); diff --git a/kdelibs.spec b/kdelibs.spec index c3a4249..b441396 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -12,7 +12,7 @@ Summary: KDE Libraries Version: 4.5.80 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -90,8 +90,6 @@ Patch27: kdelibs-4.5.80-no_rpath.patch # reverting to our past gnupg2-only setup. # TODO: try to use either gpg or gpg2, whichever is available Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch -# fix build failure triggered by "build fix" (patch by Jonathan Riddell) -Patch51: kdelibs-4.5.80-fix-build.patch ## 4.6 upstream ## trunk upstream @@ -266,7 +264,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstreamable patches %patch50 -p1 -b .knewstuff_gpg2 -%patch51 -p1 -b .fix-build # upstream patches @@ -520,6 +517,9 @@ rm -rf %{buildroot} %changelog +* Tue Nov 23 2010 Kevin Kofler - 4.5.80-5 +- respun tarball (again), includes fix-build patch + * Tue Nov 23 2010 Kevin Kofler - 4.5.80-4 - respun tarball - fix build failure triggered by "build fix" (patch by Jonathan Riddell) diff --git a/sources b/sources index 7fe7ef6..60a607c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8afbd5e0b36ab4f138689b3dfc28e61 kdelibs-4.5.80.tar.bz2 +abe5f66b279e5d88ec6c799ca2c2b6d5 kdelibs-4.5.80.tar.bz2