diff options
author | Eric Hameleers <alien@slackware.com> | 2017-01-27 11:09:34 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-01-27 11:09:34 +0100 |
commit | 992c0f455c8dde29e22d17a5adaade64097cf747 (patch) | |
tree | f0c59fe8ebebb6796344ac4c8ecb57228dd7e97a | |
parent | f3c4a81ab1051c82fb5663d70e3ffc7bd678e09f (diff) | |
download | ktown-992c0f455c8dde29e22d17a5adaade64097cf747.tar.gz ktown-992c0f455c8dde29e22d17a5adaade64097cf747.tar.xz |
kdepimlibs4: Remove files that clash with other packages.
Notably, files that are provided by the Frameworks version of kdepimlibs,
and by the gpgme package.
-rw-r--r-- | kde/post-install/kdepimlibs4.post-install | 1 | ||||
-rw-r--r-- | kde/pre-install/kdepimlibs4.pre-install | 2 |
2 files changed, 3 insertions, 0 deletions
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 |