rpms/kpackagekit/devel FindQPackageKit.cmake, NONE, 1.1 kpackagekit-0.3.1-cmake_module_path.patch, NONE, 1.1 kpackagekit-0.3.1-pk_api.patch, NONE, 1.1 kpackagekit.spec, 1.10, 1.11
Rex Dieter
rdieter at fedoraproject.org
Tue Oct 21 15:33:24 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22584
Modified Files:
kpackagekit.spec
Added Files:
FindQPackageKit.cmake
kpackagekit-0.3.1-cmake_module_path.patch
kpackagekit-0.3.1-pk_api.patch
Log Message:
* Tue Oct 21 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-4
- build against PackageKit-qt
--- NEW FILE FindQPackageKit.cmake ---
# - Try to find QPackageKit
# Once done this will define
#
# QPACKAGEKIT_FOUND - system has QPackageKit
# QPACKAGEKIT_INCLUDE_DIR - the QPackageKit include directory
# QPACKAGEKIT_LIB - Link these to use QPackageKit
# QPACKAGEKIT_DEFINITIONS - Compiler switches required for using QPackageKit
# Copyright (c) 2008, Adrien Bustany, <madcat at mymadcat.com>
#
# Redistribution and use is allowed according to the terms of the GPLv2+ license.
IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
SET(QPACKAGEKIT_FIND_QUIETLY TRUE)
ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
FIND_PATH( QPACKAGEKIT_INCLUDE_DIR packagekit-qt/QPackageKit PATHS ${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/PackageKit ${INCLUDE_INSTALL_DIR} )
FIND_LIBRARY( QPACKAGEKIT_LIB NAMES packagekit-qt PATHS ${KDE4_LIB_DIR} )
IF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
SET(QPACKAGEKIT_FOUND TRUE)
ELSE (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
SET(QPACKAGEKIT_FOUND FALSE)
ENDIF (QPACKAGEKIT_INCLUDE_DIR AND QPACKAGEKIT_LIB)
SET(QPACKAGEKIT_INCLUDE_DIR ${QPACKAGEKIT_INCLUDE_DIR}/packagekit-qt)
IF (QPACKAGEKIT_FOUND)
IF (NOT QPACKAGEKIT_FIND_QUIETLY)
MESSAGE(STATUS "Found QPackageKit: ${QPACKAGEKIT_LIB}")
ENDIF (NOT QPACKAGEKIT_FIND_QUIETLY)
ELSE (QPACKAGEKIT_FOUND)
IF (QPACKAGEKIT_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could NOT find QPackageKit")
ENDIF (QPACKAGEKIT_FIND_REQUIRED)
ENDIF (QPACKAGEKIT_FOUND)
MARK_AS_ADVANCED(QPACKAGEKIT_INCLUDE_DIR QPACKAGEKIT_LIB)
kpackagekit-0.3.1-cmake_module_path.patch:
--- NEW FILE kpackagekit-0.3.1-cmake_module_path.patch ---
diff -up KPackageKit/CMakeLists.txt.cmake_module_path KPackageKit/CMakeLists.txt
--- KPackageKit/CMakeLists.txt.cmake_module_path 2008-10-15 17:38:27.000000000 -0500
+++ KPackageKit/CMakeLists.txt 2008-10-21 10:13:48.000000000 -0500
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.4.8)
project(KPackageKit)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules/)
+
find_package(KDE4 REQUIRED)
find_package(QPackageKit REQUIRED)
include(KDE4Defaults)
kpackagekit-0.3.1-pk_api.patch:
--- NEW FILE kpackagekit-0.3.1-pk_api.patch ---
diff -up KPackageKit/Common/KpkStrings.cpp.pk_api KPackageKit/Common/KpkStrings.cpp
--- KPackageKit/Common/KpkStrings.cpp.pk_api 2008-10-15 17:38:27.000000000 -0500
+++ KPackageKit/Common/KpkStrings.cpp 2008-10-21 10:09:07.000000000 -0500
@@ -549,8 +549,8 @@ QString KpkStrings::groups(Client::Group
return i18n("Documentation");
case Client::Electronics :
return i18n("Electronics");
- case Client::MetaPackages ://TODO check this one
- return i18n("Package collections");
+// case Client::MetaPackages ://TODO check this one
+// return i18n("Package collections");
case Client::Security :
return i18n("Security");
case Client::Servers :
@@ -606,8 +606,8 @@ KIcon KpkStrings::groupsIcon(Client::Gro
return KIcon("applications-education-language");
case Client::Maps :
return KIcon("Maps");//FIXME
- case Client::MetaPackages :
- return KIcon("unknown");//FIXME
+// case Client::MetaPackages :
+// return KIcon("unknown");//FIXME
case Client::Multimedia :
return KIcon("applications-multimedia");
case Client::Network :
Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kpackagekit.spec 20 Oct 2008 18:19:47 -0000 1.10
+++ kpackagekit.spec 21 Oct 2008 15:32:54 -0000 1.11
@@ -2,7 +2,7 @@
Name: kpackagekit
Version: 0.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: KDE interface for PackageKit
License: GPLv2+
@@ -11,13 +11,18 @@
URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://websvn.kde.org/*checkout*/trunk/playground/sysadmin/kpackagekit/cmake/modules/FindQPackageKit.cmake
+Source1: FindQPackageKit.cmake
+
Patch1: kpackagekit-0.3.1-kdeinit.patch
+Patch2: kpackagekit-0.3.1-cmake_module_path.patch
+Patch3: kpackagekit-0.3.1-pk_api.patch
BuildRequires: cmake
+BuildRequires: desktop-file-utils
BuildRequires: kde-filesystem
BuildRequires: kdelibs4-devel
-BuildRequires: qpackagekit-devel
-Requires: PackageKit >= 0.3
+BuildRequires: PackageKit-qt-devel
%description
KDE interface for PackageKit.
@@ -27,16 +32,32 @@
%patch1 -p1 -b .kdeinit
+install -p -D %{SOURCE1} cmake/modules/FindQPackageKit.cmake
+%patch2 -p1 -b .cmake_module_path
+
+%patch3 -p1 -b .pk_api
+
%build
-%{cmake_kde4} .
-make %{?_smp_mflags}
+%{cmake_kde4} \
+ -DQPACKAGEKIT_INCLUDE_DIR=%{_includedir}/PackageKit/ \
+ .
+
+make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=${RPM_BUILD_ROOT}
+desktop-file-install \
+ --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+ --vendor="" \
+ --remove-category="SoftwareManagement" \
+ --add-category="X-SoftwareManagement" \
+ $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kpackagekit.desktop
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -53,6 +74,9 @@
%changelog
+* Tue Oct 21 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-4
+- build against PackageKit-qt
+
* Mon Oct 20 2008 Rex Dieter <rdieter at fedoraproject.rog> 0.3.1-3
- patch kpackagekit.desktop (guessed correct X-DBUS-ServiceName value),
fixes: KDEInit could not launch "/usr/bin/kpackagekit"
More information about the scm-commits
mailing list