From 992c0f455c8dde29e22d17a5adaade64097cf747 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 27 Jan 2017 11:09:34 +0100 Subject: kdepimlibs4: Remove files that clash with other packages. Notably, files that are provided by the Frameworks version of kdepimlibs, and by the gpgme package. --- kde/post-install/kdepimlibs4.post-install | 1 + kde/pre-install/kdepimlibs4.pre-install | 2 ++ 2 files changed, 3 insertions(+) (limited to 'kde') diff --git a/kde/post-install/kdepimlibs4.post-install b/kde/post-install/kdepimlibs4.post-install index ae30cc8..0cd6c30 100644 --- a/kde/post-install/kdepimlibs4.post-install +++ b/kde/post-install/kdepimlibs4.post-install @@ -1,3 +1,4 @@ # Remove files that clash with the Frameworks version of kdepimlibs: rm -r $PKG/usr/bin +rm -r $PKG/usr/share/akonadi rm -r $PKG/usr/share/config.kcfg diff --git a/kde/pre-install/kdepimlibs4.pre-install b/kde/pre-install/kdepimlibs4.pre-install index a663cc6..d120701 100644 --- a/kde/pre-install/kdepimlibs4.pre-install +++ b/kde/pre-install/kdepimlibs4.pre-install @@ -5,3 +5,5 @@ if ! grep -q 'cmake_minimum_required' CMakeLists.txt ; then sed -i -e '1icmake_minimum_required(VERSION 2.8.9)\' CMakeLists.txt fi +# Don't build gpgme++ +sed -e '/gpgme++/d' -e '/qgpgme/d' -i CMakeLists.txt -- cgit v1.2.3