[arch-commits] Commit in (5 files)

[Felix Yan]

    Date: Friday, January 16, 2015 @ 08:18:44
  Author: fyan
Revision: 229338

rename: kdesdk-okteta -> okteta

Added:
  okteta/
  okteta/trunk/okteta.install
    (from rev 229059, kdesdk-okteta/trunk/kdesdk-okteta.install)
Modified:
  okteta/trunk/PKGBUILD
Deleted:
  kdesdk-okteta/
  okteta/trunk/kdesdk-okteta.install

-----------------------+
 PKGBUILD              |   26 ++++++++++++++++----------
 kdesdk-okteta.install |   12 ------------
 okteta.install        |   12 ++++++++++++
 3 files changed, 28 insertions(+), 22 deletions(-)

Modified: okteta/trunk/PKGBUILD
===================================================================
--- kdesdk-okteta/trunk/PKGBUILD	2015-01-15 12:50:20 UTC (rev 229059)
+++ okteta/trunk/PKGBUILD	2015-01-16 07:18:44 UTC (rev 229338)
@@ -1,8 +1,9 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 
-pkgname=kdesdk-okteta
-pkgver=4.14.3
+pkgname=okteta
+pkgver=14.12.1
 pkgrel=1
 pkgdesc='Hex Editor'
 url='http://kde.org/applications/utilities/okteta/'
@@ -9,11 +10,13 @@
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
+depends=('kcmutils' 'kparts' 'knewstuff' 'qca-qt5')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools')
+replaces=('kdesdk-okteta')
+conflicts=('kdesdk-okteta<4.14.3-2')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okteta-${pkgver}.tar.xz")
-sha1sums=('479779119ef5dd5cea2b2acf1f134b355dffe74d')
+source=("http://download.kde.org/stable/applications/${pkgver}/src/okteta-${pkgver}.tar.xz")
+sha1sums=('3d9caab4e6fa31e96ceb51032e9a97db663f0060')
 
 build() {
   mkdir build
@@ -20,12 +23,15 @@
   cd build
   cmake ../okteta-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 
 package() {
   cd build
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 }

Deleted: okteta/trunk/kdesdk-okteta.install
===================================================================
--- kdesdk-okteta/trunk/kdesdk-okteta.install	2015-01-15 12:50:20 UTC (rev 229059)
+++ okteta/trunk/kdesdk-okteta.install	2015-01-16 07:18:44 UTC (rev 229338)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: okteta/trunk/okteta.install (from rev 229059, kdesdk-okteta/trunk/kdesdk-okteta.install)
===================================================================
--- okteta/trunk/okteta.install	                        (rev 0)
+++ okteta/trunk/okteta.install	2015-01-16 07:18:44 UTC (rev 229338)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}