diff --git a/kdelibs-4.4.80-icon-name-qt47.patch b/kdelibs-4.4.80-icon-name-qt47.patch deleted file mode 100644 index fd9e198..0000000 --- a/kdelibs-4.4.80-icon-name-qt47.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp ---- kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp.icon-name-qt47 2010-05-16 22:04:05.000000000 +0200 -+++ kdelibs-4.4.80/kdeui/notifications/kstatusnotifieritem.cpp 2010-05-21 22:50:44.819211510 +0200 -@@ -65,14 +65,7 @@ protected: - virtual QString iconNameForAction(QAction *action) - { - KIcon icon(action->icon()); --#if QT_VERSION >= 0x040700 -- // QIcon::name() is in the 4.7 git branch, but it is not in 4.7 TP. -- // If you get a build error here, you need to update your pre-release -- // of Qt 4.7. -- return icon.isNull() ? QString() : icon.name(); --#else - return QString(); --#endif - } - }; - diff --git a/kdelibs.spec b/kdelibs.spec index 95375c2..1df5b3d 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -1,15 +1,16 @@ %define attica_ver 0.1.4 +%define dbusmenu_qt_ver 0.5.2 %define phonon_ver 4.4.2 -%define qt4_ver 4.7.0-0.25.beta2 -%define soprano_ver 2.4.63 +%define qt4_ver 4.6.2 +%define soprano_ver 2.5.0 %define strigi_ver 0.7.2 # to build/include apidocs or not %define apidocs 1 Summary: KDE Libraries Version: 4.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -27,6 +28,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde-filesystem >= 4-23 BuildRequires: docbook-dtds docbook-style-xsl +%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver}) +Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version} Requires: docbook-dtds docbook-style-xsl Requires: hicolor-icon-theme Requires: kde-filesystem >= 4-23 @@ -446,6 +449,10 @@ rm -rf %{buildroot} %changelog +* Tue Aug 10 2010 Rex Dieter - 4.5.0-2 +- (Build)Requires: qt4(-devel) >= 4.6.3 +- dbusmenu_qt_ver 0.5.2, soprano_ver 4.5.0 + * Tue Aug 03 2010 Than Ngo - 4.5.0-1 - 4.5.0