diff --git a/desktop/kde/kde5-framework/kde5-kcoreaddons/actions.py b/desktop/kde/kde5-framework/kde5-kcoreaddons/actions.py old mode 100755 new mode 100644 index 3ee8408ad5..11b2858877 --- a/desktop/kde/kde5-framework/kde5-kcoreaddons/actions.py +++ b/desktop/kde/kde5-framework/kde5-kcoreaddons/actions.py @@ -4,21 +4,16 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt +from pisi.actionsapi import kde5 from pisi.actionsapi import pisitools -from pisi.actionsapi import cmaketools def setup(): - cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ - -DLIB_INSTALL_DIR=lib \ - -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt5/mkspecs/modules \ - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -D_KDE4_DEFAULT_HOME_POSTFIX=4 \ - -DBUILD_TESTING=OFF") + kde5.configure() def build(): - cmaketools.make() + kde5.make() def install(): - cmaketools.install() - + kde5.install() + pisitools.dodoc("README.md", "COPYING.LIB") diff --git a/desktop/kde/kde5-framework/kde5-kcoreaddons/comar/package.py b/desktop/kde/kde5-framework/kde5-kcoreaddons/comar/package.py index de8ea402fe..ef1e236be6 100644 --- a/desktop/kde/kde5-framework/kde5-kcoreaddons/comar/package.py +++ b/desktop/kde/kde5-framework/kde5-kcoreaddons/comar/package.py @@ -3,6 +3,6 @@ from pisi.version import Version def postInstall(fromVersion, fromRelease, toVersion, toRelease): - if update-mime-database usr/share/mime > /dev/null + os.system("/usr/bin/update-mime-database /usr/share/mime") diff --git a/desktop/kde/kde5-framework/kde5-kcoreaddons/pspec.xml b/desktop/kde/kde5-framework/kde5-kcoreaddons/pspec.xml index aef9d6797a..0758be09ac 100755 --- a/desktop/kde/kde5-framework/kde5-kcoreaddons/pspec.xml +++ b/desktop/kde/kde5-framework/kde5-kcoreaddons/pspec.xml @@ -13,7 +13,7 @@ app:console Utilities for core application functionality and accessing the OS KCoreAddons provides classes built on top of QtCore to perform various tasks such as manipulating mime types, autosaving files, creating backup files, generating random sequences, performing text manipulations such as macro replacement, accessing user information and many more. - http://download.kde.org/stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz + http://download.kde.org/stable/frameworks/5.11/kcoreaddons-5.11.0.tar.xz qt5-base-devel qt5-tools-devel @@ -49,12 +49,19 @@ /usr/lib/cmake /usr/lib/pkgconfig - + + + 2015-06-21 + 5.11.0 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + 2015-05-30 5.10.0