[packages/kde4-kdeadmin] - fix cmake deps - rel 3

baggins baggins at pld-linux.org
Fri Oct 4 10:31:06 CEST 2019


commit d887157f07a0c4bfb5f42e710510efcc9494bc97
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 4 10:30:02 2019 +0200

    - fix cmake deps
    - rel 3

 cmake.patch        | 10 ++++++++++
 kde4-kdeadmin.spec |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/kde4-kdeadmin.spec b/kde4-kdeadmin.spec
index 73c358b..b2618a9 100644
--- a/kde4-kdeadmin.spec
+++ b/kde4-kdeadmin.spec
@@ -14,11 +14,12 @@ Summary(pt_BR.UTF-8):	K Desktop Environment - ferramentas administrativas
 Summary(zh_CN.UTF-8):	KDE管理工具
 Name:		kde4-kdeadmin
 Version:	4.10.5
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	45e612c72bb1be5497e53757bf85c5dd
+Patch0:		cmake.patch
 URL:		http://www.kde.org/
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	cmake >= 2.8.0
@@ -27,7 +28,7 @@ BuildRequires:	docbook-style-xsl
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
 BuildRequires:	python-PyKDE4 >= %{version}
-BuildRequires:	python-PyQt4-devel
+BuildRequires:	sip-PyQt4
 BuildRequires:	python-pycups
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
@@ -109,6 +110,7 @@ Ferramenta para administração de usuários do sistema.
 
 %prep
 %setup -q -n %{orgname}-%{version}
+%patch0 -p1
 
 %build
 install -d build
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..f57f9fc
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,10 @@
+--- kdeadmin-4.10.5/CMakeLists.txt~	2013-06-29 12:52:49.000000000 +0200
++++ kdeadmin-4.10.5/CMakeLists.txt	2019-10-04 10:28:54.738857045 +0200
+@@ -6,6 +6,7 @@
+ find_package( KDE4 REQUIRED )
+ include( KDE4Defaults )
+ include( MacroLibrary )
++include(CheckIncludeFiles)
+ 
+ add_definitions( ${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
+ add_definitions( -DQT_NO_CAST_FROM_ASCII )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdeadmin.git/commitdiff/d887157f07a0c4bfb5f42e710510efcc9494bc97



More information about the pld-cvs-commit mailing list