rpms/kde-plasma-quickaccess/F-10 kde-plasma-quickaccess-0.7.1-kde42-build.patch, NONE, 1.1 kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch, NONE, 1.1 kde-plasma-quickaccess.spec, 1.2, 1.3

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29777

Modified Files:
	kde-plasma-quickaccess.spec 
Added Files:
	kde-plasma-quickaccess-0.7.1-kde42-build.patch 
	kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch 
Log Message:
* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
- KDE 4.2.0 build patch (Plasma package no more required)

* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
- KDE 4.2.0 rebuild


kde-plasma-quickaccess-0.7.1-kde42-build.patch:

--- NEW FILE kde-plasma-quickaccess-0.7.1-kde42-build.patch ---
diff -up quickaccess-0.7.1/CMakeLists.txt.kde42-build quickaccess-0.7.1/CMakeLists.txt
--- quickaccess-0.7.1/CMakeLists.txt.kde42-build	2008-08-03 12:29:26.000000000 +0200
+++ quickaccess-0.7.1/CMakeLists.txt	2009-01-28 17:33:02.000000000 +0100
@@ -4,7 +4,6 @@ project(quickaccess)
 # Find the required Libaries
 find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
-find_package(Plasma REQUIRED)
  
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories(
@@ -21,7 +20,7 @@ set(quickaccess_SRCS quickaccess.cpp pop
 kde4_add_ui_files(quickaccess_SRCS quickaccessConfig.ui pluginwidgetbase.ui)
 kde4_add_plugin(plasma_applet_quickaccess ${quickaccess_SRCS})
 target_link_libraries(plasma_applet_quickaccess 
-                      ${PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
+                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kfile konq)
  
 install(TARGETS plasma_applet_quickaccess
         DESTINATION ${PLUGIN_INSTALL_DIR})

kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch:

--- NEW FILE kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch ---
diff -up quickaccess-0.7.1/quickaccess.cpp.kde42-iconwidget quickaccess-0.7.1/quickaccess.cpp
--- quickaccess-0.7.1/quickaccess.cpp.kde42-iconwidget	2008-08-03 12:29:26.000000000 +0200
+++ quickaccess-0.7.1/quickaccess.cpp	2008-11-20 15:28:58.000000000 +0100
@@ -40,7 +40,7 @@
 QuickAccess::QuickAccess(QObject *parent, const QVariantList &args)
   :Plasma::Applet(parent, args)
   ,m_settings(new Settings(this))
-  ,m_icon(new Plasma::Icon(this))
+  ,m_icon(new Plasma::IconWidget(this))
   ,m_dialog(0)
   ,m_dialogSize(QSize())
   ,m_dragOver(false)
diff -up quickaccess-0.7.1/quickaccess.h.kde42-iconwidget quickaccess-0.7.1/quickaccess.h
--- quickaccess-0.7.1/quickaccess.h.kde42-iconwidget	2008-11-20 15:28:31.000000000 +0100
+++ quickaccess-0.7.1/quickaccess.h	2008-11-20 15:28:11.000000000 +0100
@@ -22,7 +22,7 @@
 
 //Plasma includes
 #include <Plasma/Applet>
-#include <plasma/widgets/icon.h>
+#include <plasma/widgets/iconwidget.h>
 
 //locale includes
 #include "popupdialog.h"
@@ -63,7 +63,7 @@ class QuickAccess : public Plasma::Apple
     
   private:
     Settings *m_settings;
-    Plasma::Icon *m_icon;
+    Plasma::IconWidget *m_icon;
     PopupDialog *m_dialog;
     QSize m_dialogSize;
     bool m_dragOver;


Index: kde-plasma-quickaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-quickaccess/F-10/kde-plasma-quickaccess.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde-plasma-quickaccess.spec	7 Nov 2008 13:48:38 -0000	1.2
+++ kde-plasma-quickaccess.spec	28 Jan 2009 16:53:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           kde-plasma-quickaccess
 Version:        0.7.1
-Release:        2%{?dist}
+Release:        7%{?dist}
 Summary:        Plasma applet for quick access to the most used folders
 
 Group:          User Interface/Desktops
@@ -9,12 +9,15 @@
 
 Source0:        http://www.kde-look.org/CONTENT/content-files/84128-quickaccess-%{version}.tar.gz
 Patch0:         kde-plasma-quickaccess-0.7.1-default-size.patch
+Patch1:         kde-plasma-quickaccess-0.7.1-kde42-iconwidget.patch
+Patch2:         kde-plasma-quickaccess-0.7.1-kde42-build.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-workspace-devel >= 4.1.0
-BuildRequires:  kdelibs-devel >= 4.1.0
-BuildRequires:  kdebase-devel >= 4.1.0 
+BuildRequires:  kdebase-workspace-devel >= 4.2.0
+BuildRequires:  kdelibs-devel >= 4.2.0
+BuildRequires:  kdebase-devel >= 4.2.0
+BuildRequires:  kdebase-libs >= 4.2.0
 
 %description
 QuickAccess is a small applet designed for the panel to have quick access
@@ -24,6 +27,8 @@
 %prep
 %setup -qn quickaccess-%{version}
 %patch0 -p1 -b .default-size
+%patch1 -p1 -b .kde42-iconwidget
+%patch2 -p1 -b .kde42-build
 
 
 %build
@@ -32,7 +37,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform}
+make VERBOSE=1 %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -55,8 +60,26 @@
 %{_kde4_datadir}/kde4/services/plasma-applet-quickaccess.desktop
 
 %changelog
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-7
+- KDE 4.2.0 build patch (Plasma package no more required)
+
+* Wed Jan 29 2009 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-6
+- KDE 4.2.0 rebuild 
+
+* Sun Dec 14 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.7.1-5
+- drop libkonq hack, linker search path fixed in kdelibs now
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-4
+- build requires
+- build problem ugly hack (lkonq)
+- make VERBOSE=1
+
+* Tue Dec 02 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-3
+- patched for KDE 4.2 Plasma API
+
 * Thu Nov 06 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-2
 - default size patch
 - fix URL
+
 * Wed Sep 10 2008 Jaroslav Reznik <jreznik at redhat.com> 0.7.1-1
-- Initial package
\ No newline at end of file
+- Initial package