The AddRm gui is almost there,

but everything is broken cause the lib swicthed to cmake
Fixed install/remove crash
and fixed the location of FindQPackageKit

14 files changed, 114 insertions, 123 deletions

diff --git a/gui/AddRm/CMakeLists.txt b/gui/AddRm/CMakeLists.txt
index 06f5739..9a61149 100644
--- a/gui/AddRm/CMakeLists.txt
+++ b/gui/AddRm/CMakeLists.txt
@@ -17,6 +17,6 @@ kde4_add_ui_files(kpk_addrm_SRCS
 )
 
 kde4_add_plugin(kcm_kpk_addrm ${kpk_addrm_SRCS})
-target_link_libraries(kcm_kpk_addrm ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} packagekit-qt )
+target_link_libraries(kcm_kpk_addrm ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF2_LIBS} ${QPACKAGEKIT_LIBS} )
 
 install(TARGETS kcm_kpk_addrm  DESTINATION ${PLUGIN_INSTALL_DIR} )
\ No newline at end of file
diff --git a/gui/AddRm/PkAddRm.cpp b/gui/AddRm/PkAddRm.cpp
index 116383a..9a40e60 100755
--- a/gui/AddRm/PkAddRm.cpp
+++ b/gui/AddRm/PkAddRm.cpp
@@ -270,7 +270,10 @@ void PkAddRm::on_packageView_pressed( const QModelIndex & index )
 void PkAddRm::save()
 {
     PkReviewChanges *frm = new PkReviewChanges( m_pkg_model_main->packagesChanges(), this);
-    frm->exec();
+    if ( frm->exec() == QDialog::Accepted )
+        m_pkg_model_main->clearPkgChanges();
+//     else
+//         emit( changed(true) );
     delete frm;
 }
 
diff --git a/gui/AddRm/PkAddRm.h b/gui/AddRm/PkAddRm.h
index 2f8a410..c91b1df 100755
--- a/gui/AddRm/PkAddRm.h
+++ b/gui/AddRm/PkAddRm.h
@@ -29,7 +29,7 @@
 #include "PkAddRm_Model.h"
 #include "PkDelegate.h"
 
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 #include "ui_PkAddRm.h"
 
 using namespace PackageKit;
diff --git a/gui/AddRm/PkAddRm_Model.cpp b/gui/AddRm/PkAddRm_Model.cpp
index dd70646..43c03af 100644
--- a/gui/AddRm/PkAddRm_Model.cpp
+++ b/gui/AddRm/PkAddRm_Model.cpp
@@ -81,6 +81,9 @@ bool PkAddRmModel::setData( const QModelIndex &index, const QVariant &value, int
         // now we check if we need to add or remove from the list
         if ( value.toBool() ) {
             // Add
+	    // its good to check if the package isn't already in
+	    // this might happen for example if the user installed
+	    // 
 	    m_packagesChanges.append( package(index) );
 	    emit dataChanged(index, index);
 	    emit changed( !m_packagesChanges.isEmpty() );
@@ -150,6 +153,7 @@ void PkAddRmModel::clearPkg()
 
 void PkAddRmModel::clearPkgChanges()
 {
+    qDebug() << "Changes cleared";
     m_packagesChanges.clear();
     emit changed( !m_packagesChanges.isEmpty() );
 }
diff --git a/gui/AddRm/PkAddRm_Model.h b/gui/AddRm/PkAddRm_Model.h
index c49b22d..3037663 100644
--- a/gui/AddRm/PkAddRm_Model.h
+++ b/gui/AddRm/PkAddRm_Model.h
@@ -4,7 +4,7 @@
 #include <QAbstractTableModel>
 #include <KIcon>
 
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 using namespace PackageKit;
 
diff --git a/gui/AddRm/PkReviewChanges.cpp b/gui/AddRm/PkReviewChanges.cpp
index 58a6607..eeedb83 100755
--- a/gui/AddRm/PkReviewChanges.cpp
+++ b/gui/AddRm/PkReviewChanges.cpp
@@ -21,13 +21,14 @@
 #include <KMessageBox>
 #include <KDebug>
 
+#include "PkRequirements.h"
 #include "PkTransaction.h"
 #include "PkReviewChanges.h"
 
 #define UNIVERSAL_PADDING 6
 
 PkReviewChanges::PkReviewChanges( const QList<Package*> &packages, QWidget *parent )
- : KDialog(parent), m_waitPD(0), m_requimentD(0)
+ : KDialog(parent), m_waitPD(0)
 {
     setupUi( mainWidget() );
 
@@ -53,19 +54,6 @@ void PkReviewChanges::updateProgress()
         m_waitPD->progressBar()->setValue( m_waitPD->progressBar()->value() + 1 );
 }
 
-void PkReviewChanges::ProgressChanged(uint /*percentage*/, uint /*subpercentage*/, uint /*elapsed*/, uint /*remaining*/)
-{
-//     m_pbTimer->stop();
-//     progressBar->setMaximum(100);
-//     progressBar->setValue(percentage);
-}
-
-void PkReviewChanges::currPackage(Package */*p*/)
-{
-//     packageL->setText( p->name() + " - " + p->version() + " (" + p->arch() + ")" );
-//     descriptionL->setText( p->summary() );
-}
-
 PkReviewChanges::~PkReviewChanges()
 {
 
@@ -98,6 +86,7 @@ void PkReviewChanges::doAction()
 void PkReviewChanges::checkTask()
 {
     if ( !m_remPackages.isEmpty() ) {
+        qDebug() << "task rm if";
         if ( m_daemon->getActions() & Actions::Remove_packages ) {
 	    if ( m_daemon->getActions() & Actions::Get_requires ) {
 	        m_reqDepPackages = m_remPackages;
@@ -121,6 +110,7 @@ void PkReviewChanges::checkTask()
 	    KMessageBox::error( this, i18n("Sorry, your backend does not support removing packages"), i18n("Erro KPackageKit") );
     }
     else if ( !m_addPackages.isEmpty() ) {
+        qDebug() << "task add else";
         if ( m_daemon->getActions() & Actions::Install_packages ) {
 	    if ( m_daemon->getActions() & Actions::Get_depends ) {
 	        m_reqDepPackages = m_addPackages;
@@ -130,7 +120,7 @@ void PkReviewChanges::checkTask()
                 connect( m_transactionDep, SIGNAL( GotPackage(Package *) ), m_pkgModelDep, SLOT( addUniquePackage(Package *) ) );
                 connect( m_transactionDep, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( depFinished(Exit::Value, uint) ) );
 		// Create a KProgressDialog to don't upset the user
-		m_waitPD = new KProgressDialog(this, i18n("Wait - KPackageKit"), i18n("Checking dependat packages") );
+		m_waitPD = new KProgressDialog(this, i18n("Wait - KPackageKit"), i18n("Checking dependant packages") );
 		m_waitPD->progressBar()->setMinimum(0);
 		m_waitPD->progressBar()->setMaximum(0);
 		m_waitPD->setAutoClose(false);
@@ -143,23 +133,25 @@ void PkReviewChanges::checkTask()
 	else
 	    KMessageBox::error( this, i18n("Sorry, your backend does not support installing packages"), i18n("Erro KPackageKit") );
     }
-    else
-        close();
+    else {
+        qDebug() << "task else";
+        KDialog::slotButtonClicked(KDialog::Ok);
+    }
 }
 
 void PkReviewChanges::reqFinished(Exit::Value status, uint /*runtime*/)
 {
-    kDebug() << "reqFinished";
+    qDebug() << "reqFinished";
     if (status == Exit::Success) {
         if ( m_reqDepPackages.isEmpty() ) {
 	    m_pbTimer->stop();
 	    delete m_waitPD;
 	    m_waitPD = 0;
 	    if ( m_pkgModelReq->rowCount( QModelIndex() ) > 0 ) {
-		m_requimentD = new PkRequirements( i18n("The following packages must also be removed"), m_pkgModelReq, this );
-		connect( m_requimentD, SIGNAL( okClicked() ), this, SLOT( removePackages() ) );
-		connect( m_requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-		m_requimentD->show();
+		PkRequirements *requimentD = new PkRequirements( i18n("The following packages must also be removed"), m_pkgModelReq, this );
+		connect( requimentD, SIGNAL( okClicked() ), this, SLOT( removePackages() ) );
+		connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
+		requimentD->show();
             }
 	    else
 	        removePackages();
@@ -176,33 +168,33 @@ void PkReviewChanges::reqFinished(Exit::Value status, uint /*runtime*/)
 	m_reqDepPackages.clear();
         checkTask();
     }
+    qDebug() << "reqFinished2";
 }
 
 void PkReviewChanges::removePackages()
 {
-    kDebug() << "removePackages";
+    qDebug() << "removePackages";
     m_trans = m_daemon->newTransaction();
     PkTransaction *frm = new PkTransaction(m_trans, i18n("Remove Packages"), this);
-    connect( m_trans, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( remFinished(Exit::Vaue, uint) ) );
+    connect( frm, SIGNAL( Finished(bool) ), this, SLOT( remFinished(bool) ) );
     m_trans->removePackages(m_remPackages);
-    delete m_requimentD;
-    m_requimentD = 0;
-    frm->exec();
+    frm->show();
+    qDebug() << "finished remove";
 }
 
 void PkReviewChanges::depFinished(Exit::Value status, uint /*runtime*/)
 {
-    kDebug() << "depFinished";
+    qDebug() << "depFinished";
     if (status == Exit::Success) {
         if ( m_reqDepPackages.isEmpty() ) {
 	    m_pbTimer->stop();
 	    delete m_waitPD;
 	    m_waitPD = 0;
 	    if ( m_pkgModelDep->rowCount( QModelIndex() ) > 0 ) {
-		m_requimentD = new PkRequirements( i18n("The following packages must also be installed"), m_pkgModelDep, this );
-		connect( m_requimentD, SIGNAL( okClicked() ), this, SLOT( installPackages() ) );
-		connect( m_requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-		m_requimentD->show();
+		PkRequirements *requimentD = new PkRequirements( i18n("The following packages must also be installed"), m_pkgModelDep, this );
+		connect( requimentD, SIGNAL( okClicked() ), this, SLOT( installPackages() ) );
+		connect( requimentD, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
+		requimentD->show();
             }
 	    else
 	        installPackages();
@@ -218,38 +210,42 @@ void PkReviewChanges::depFinished(Exit::Value status, uint /*runtime*/)
 	m_reqDepPackages.clear();
         checkTask();
     }
+    qDebug() << "depFinished2";
 }
 
 void PkReviewChanges::installPackages()
 {
-    kDebug() << "installPackages";
+    qDebug() << "installPackages";
     m_trans = m_daemon->newTransaction();
     PkTransaction *frm = new PkTransaction(m_trans, QString(i18n("Install Packages")), this);
-    connect( m_trans, SIGNAL( Finished(Exit::Value, uint) ), this, SLOT( addFinished(Exit::Vaue, uint) ) );
+    connect( frm, SIGNAL( Finished(bool) ), this, SLOT( addFinished(bool) ) );
     m_trans->installPackages(m_addPackages);
-    delete m_requimentD;
-    m_requimentD = 0;
-    frm->exec();
+    frm->show();
+    qDebug() << "finished install";
 }
 
-void PkReviewChanges::remFinished(Exit::Value status, uint /*runtime*/)
+void PkReviewChanges::remFinished(bool error)
 {
-    if (status == Exit::Success) {
+    if (error) {
+        KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
+	setButtons( KDialog::Close );
+    }
+    else {
         m_remPackages.clear();
-        checkTask();
+	checkTask();
     }
-    else
-        KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
 }
 
-void PkReviewChanges::addFinished(Exit::Value status, uint /*runtime*/)
+void PkReviewChanges::addFinished(bool error)
 {
-    if (status == Exit::Success) {
+    if (error) {
+        KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
+	setButtons( KDialog::Close );
+    }
+    else {
         m_addPackages.clear();
-        checkTask();
+	checkTask();
     }
-    else
-        KMessageBox::error( this, i18n("Sorry an error ocoured"), i18n("Erro KPackageKit") );
 }
 
 void PkReviewChanges::slotButtonClicked(int button)
diff --git a/gui/AddRm/PkReviewChanges.h b/gui/AddRm/PkReviewChanges.h
index 5bfc93e..f18971a 100755
--- a/gui/AddRm/PkReviewChanges.h
+++ b/gui/AddRm/PkReviewChanges.h
@@ -24,11 +24,10 @@
 #include <KDialog>
 #include <KProgressDialog>
 
-#include "PkRequirements.h"
 #include "PkDelegate.h"
 #include "PkAddRm_Model.h"
 #include "ui_PkReviewChanges.h"
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 using namespace PackageKit;
 
@@ -40,22 +39,21 @@ public:
     ~PkReviewChanges();
 
 public slots:
-    void remFinished(Exit::Value status, uint runtime);
-    void addFinished(Exit::Value status, uint runtime);
+    void remFinished(bool);
+    void addFinished(bool);
     void ErrorCode(const QString &one, const QString &two);
-//     void StatusChanged(Status::Value v);
-    void ProgressChanged(uint percentage, uint subpercentage, uint elapsed, uint remaining);
+
     void reqFinished(Exit::Value status, uint runtime);
     void depFinished(Exit::Value status, uint runtime);
     void installPackages();
     void removePackages();
+    void updateProgress();
 
 private:
     PkAddRmModel *m_pkgModelMain, *m_pkgModelReq, *m_pkgModelDep;
     PkDelegate *m_pkgDelegate;
     
     KProgressDialog *m_waitPD;
-    PkRequirements *m_requimentD;
     
     Daemon *m_daemon;
     Transaction *m_trans;
@@ -73,10 +71,6 @@ private:
     QList<Package*> m_addPackages;
     QList<Package*> m_reqDepPackages;
 
-private slots:
-    void currPackage(Package *);
-    void updateProgress();
-
 protected slots:
     virtual void slotButtonClicked(int button);
 
diff --git a/gui/AddRm/PkTransaction.cpp b/gui/AddRm/PkTransaction.cpp
index 5d0f2f6..173f4ef 100755
--- a/gui/AddRm/PkTransaction.cpp
+++ b/gui/AddRm/PkTransaction.cpp
@@ -19,11 +19,8 @@
  ***************************************************************************/
 
 #include <KLocale>
-// #include <KStandardDirs>
 #include <KMessageBox>
 
-// #include <QPalette>
-// #include <QColor>
 #include "../Common/PkStrings.h"
 #include "PkTransaction.h"
 
@@ -49,6 +46,7 @@ PkTransaction::PkTransaction( Transaction *trans, QString caption, QWidget *pare
     m_pbTimer = new QTimer(this);
     connect(m_pbTimer, SIGNAL(timeout()), this, SLOT(updateProgress() ));
     m_pbTimer->start(5);
+    setModal(true);
 
     // set wait msg
     currentL->setText( i18n("Please Wait..." ) );
@@ -79,7 +77,12 @@ void PkTransaction::slotButtonClicked(int button)
             m_trans->cancel();
             break;
         case KDialog::User1 :
-            close();
+	    emit Finished(false);
+	    KDialog::slotButtonClicked(KDialog::Close);
+            break;
+	case KDialog::Close :
+	    emit Finished(true);
+            KDialog::slotButtonClicked(KDialog::Close);
             break;
         default :
             KDialog::slotButtonClicked(button);
@@ -101,53 +104,26 @@ void PkTransaction::ErrorCode(Error::Value v, const QString &details)
     KMessageBox::detailedSorry( this, PkStrings::ErrorMessage(v), details, PkStrings::Error(v), KMessageBox::Notify );
 }
 
-// void PkTransaction::reqFinished(Exit::Value status, uint runtime)
-// {
-//     switch(status) {
-//         case Exit::Success :
-//             if (m_pkg_model_req->rowCount( QModelIndex() ) > 0 ) {
-// 	        KDialog *dialog = new KDialog( this );
-//                 dialog->setCaption( "Confirm" );
-//                 dialog->setButtons( KDialog::Ok | KDialog::Cancel );
-// 
-//                 PkRequirements *widget = new PkRequirements( i18n("The following packages must also be installed"), m_pkg_model_req, this );
-//                 dialog->setMainWidget( widget );
-//                 connect( dialog, SIGNAL( okClicked() ), this, SLOT( doAction() ) );
-// 		connect( dialog, SIGNAL( cancelClicked() ), this, SLOT( close() ) );
-// 		dialog->exec();qDebug() << "exec())) ...";
-// 	    }
-//             else
-//                 doAction();
-// 		// 	case Status::Failed :
-// // 	    currentL->setText( i18n("Failed") );
-// // 	    break;
-// // 	case Status::Quit :
-// // 	    currentL->setText( i18n("Quiting") );
-// // 	    break;
-// // 	case Status::Kill :
-// // 	    currentL->setText( i18n("Killing") );
-// // 	    break;
-//     }
-// }
-
 void PkTransaction::Finished(Exit::Value status, uint /*runtime*/)
 {
-//     switch(status) {
-//         default :
-//             close();
-//     }
-qDebug() << "trans finished: " << status ;
+    qDebug() << "trans finished: " << status ;
     switch(status) {
         case Exit::Success :
 	    qDebug() << "trans succes: ";
+	    emit Finished(false);
+	    KDialog::slotButtonClicked(KDialog::Close);
 	    break;
 	case Exit::Failed :
 	    qDebug() << "trans failed: ";
-            m_notifyT.start(50);
+	    setButtons( KDialog::Close );
 	    break;
 	case Exit::Kill :
             qDebug() << "trans quit: ";
             break;
+	case Exit::Cancelled :
+            qDebug() << "trans cancelled: ";
+	    setButtons( KDialog::Close );
+            break;
 	case Exit::Unknown :
             qDebug() << "trans quit: ";
             break;
diff --git a/gui/AddRm/PkTransaction.h b/gui/AddRm/PkTransaction.h
index 0e79ab1..27982ad 100755
--- a/gui/AddRm/PkTransaction.h
+++ b/gui/AddRm/PkTransaction.h
@@ -24,7 +24,7 @@
 #include <KDialog>
 
 #include "ui_PkTransaction.h"
-#include "../../lib/QPackageKit.h"
+#include <QPackageKit>
 
 using namespace PackageKit;
 
@@ -35,21 +35,20 @@ public:
     PkTransaction( Transaction  *trans, QString caption, QWidget *parent=0);
     ~PkTransaction();
 
-public slots:
-//     void reqFinished(Exit::Value status, uint runtime);
-    void Finished(Exit::Value status, uint runtime);
-    void ErrorCode(Error::Value v, const QString &details);
-    void StatusChanged(Status::Value v);
-    void ProgressChanged(uint percentage, uint subpercentage, uint elapsed, uint remaining);
+signals:
+    void Finished(bool error);
+
 private:
     Transaction *m_trans;
-    QTimer m_notifyT;
     QTimer *m_pbTimer;
 
 private slots:
-//     void doAction();
+    void Finished(Exit::Value status, uint runtime);
+    void ErrorCode(Error::Value v, const QString &details);
+    void StatusChanged(Status::Value v);
     void currPackage(Package *);
     void updateProgress();
+    void ProgressChanged(uint percentage, uint subpercentage, uint elapsed, uint remaining);
 
 protected slots:
     virtual void slotButtonClicked(int button);
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index ffdf813..74b42de 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -6,9 +6,9 @@ find_package(KDE4 REQUIRED)
 include(KDE4Defaults)
 # TODO fix link_directories
 ## ${CMAKE_BINARY_DIR}
-link_directories( ../lib/ )
+link_directories( packagekit-qt )
 add_definitions(${QT_DEFINITIONS} ${KDE_DEFINITIONS})
-include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDE4_KIO_INCLUDES})
+include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KDE4_KIO_INCLUDES} ${QPACKAGEKIT_INCLUDE_DIR} )
 
 add_subdirectory( AddRm )
 add_subdirectory( Settings )
diff --git a/gui/Common/PkStrings.cpp b/gui/Common/PkStrings.cpp
index 1aa2d8b..6b9ebf2 100755
--- a/gui/Common/PkStrings.cpp
+++ b/gui/Common/PkStrings.cpp
@@ -361,7 +361,7 @@ KIcon PkStrings::GroupsIcon(Groups::Value v)
         case Groups::Desktop_gnome :
 	    return KIcon("user-desktop");//FIXME
         case Groups::Desktop_kde :
-	    return KIcon("start-here-kde");//CHECK
+	    return KIcon("kde");
         case Groups::Desktop_other :
 	    return KIcon("user-desktop");
         case Groups::Desktop_xfce :
@@ -395,7 +395,7 @@ KIcon PkStrings::GroupsIcon(Groups::Value v)
         case Groups::Programming :
 	    return KIcon("applications-development");
         case Groups::Publishing :
-	    return KIcon("accesories-text-editor");
+	    return KIcon("accessories-text-editor");
         case Groups::Repos :
 	    return KIcon("application-x-compressed-tar");
         case Groups::Security :
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 65c07bc..d3af79e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -55,4 +55,6 @@ install(FILES
 	DESTINATION
 	include/packagekit-qt)
 
+add_subdirectory(modules)
+
 #endif
diff --git a/lib/modules/CMakeLists.txt b/lib/modules/CMakeLists.txt
new file mode 100644
index 0000000..1f8b0a2
--- /dev/null
+++ b/lib/modules/CMakeLists.txt
@@ -0,0 +1,17 @@
+ 
+## install the cmake files
+
+file(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake")
+# FIXME remove safely /usr/share
+set(module_install_dir ${DATA_INSTALL_DIR}/usr/share/cmake/modules )
+
+install( FILES ${cmakeFiles} 
+         DESTINATION ${module_install_dir}  )
+
+
+# with cmake 2.6 and above create and install a man page for the kdelibs cmake modules
+# (cmake 2.4 doesn't support creating documentation for cmake modules in custom directories)
+# if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER "2.5")
+#    add_custom_target(KDECMakeModulesManPage ALL COMMAND ${CMAKE_COMMAND} -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} --help-custom-modules ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1)
+#    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdecmake.1 DESTINATION "${MAN_INSTALL_DIR}/man1")
+# endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER "2.5")
diff --git a/gui/cmake/modules/FindQPackageKit.cmake b/lib/modules/FindQPackageKit.cmake
index 752209d..f5d3e29 100644
--- a/gui/cmake/modules/FindQPackageKit.cmake
+++ b/lib/modules/FindQPackageKit.cmake
@@ -3,7 +3,7 @@
 #
 #  QPACKAGEKIT_FOUND - system has QPackageKit
 #  QPACKAGEKIT_INCLUDE_DIR - the QPackageKit include directory
-#  QPACKAGEKIT_LIBRARIES - Link these to use QPackageKit
+#  QPACKAGEKIT_LIBS - Link these to use QPackageKit
 #  QPACKAGEKIT_DEFINITIONS - Compiler switches required for using QPackageKit
 
 # Copyright (c) 2008, Adrien Bustany, <madcat@mymadcat.com>
@@ -11,18 +11,18 @@
 # Redistribution and use is allowed according to the terms of the GPLv3+ license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBRARIES)
+IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
     SET(QPACKAGEKIT_FIND_QUIETLY TRUE)
-ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBRARIES)
+ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
 
-FIND_PATH(QPACKAGEKIT_INCLUDE_DIR QPackageKit.h)
-FIND_LIBRARY(QPACKAGEKIT_LIBRARIES NAMES packagekit-qt)
+FIND_PATH(QPACKAGEKIT_INCLUDE_DIR QPackageKit)
+FIND_LIBRARY(QPACKAGEKIT_LIBS NAMES packagekit-qt)
 
-IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBRARIES)
+IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
    SET(QPACKAGEKIT_FOUND TRUE)
-ELSE (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBRARIES)
+ELSE (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
    SET(QPACKAGEKIT_FOUND FALSE)
-ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBRARIES)
+ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIBS)
 
 SET(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_INCLUDE_DIR/packagekit-qt)
 
@@ -36,5 +36,5 @@ ELSE (QPACKAGEKIT_FOUND)
   ENDIF (QPACKAGEKIT_FIND_REQUIRED)
 ENDIF (QPACKAGEKIT_FOUND)
 
-MARK_AS_ADVANCED(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_LIBRARIES)
+MARK_AS_ADVANCED(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_LIBS)