[arch-commits] Commit in attica (4 files)

[Andrea Scarpino]

    Date: Saturday, December 21, 2013 @ 16:07:16
  Author: andrea
Revision: 202389

Keep trunk untouched

Added:
  attica/kde-unstable/
  attica/kde-unstable/PKGBUILD
    (from rev 202270, attica/trunk/PKGBUILD)
Modified:
  attica/trunk/PKGBUILD
Deleted:
  attica/kde-unstable/PKGBUILD

-----------------------+
 PKGBUILD              |   28 ---------------------
 kde-unstable/PKGBUILD |   63 ++++++++++++++++++++++++++++++++++++++++++++++++
 trunk/PKGBUILD        |   59 +++++++++-----------------------------------
 3 files changed, 75 insertions(+), 75 deletions(-)

Deleted: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2013-12-20 19:54:40 UTC (rev 202244)
+++ kde-unstable/PKGBUILD	2013-12-21 15:07:16 UTC (rev 202389)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=attica
-pkgver=0.4.2
-pkgrel=1
-pkgdesc='A Qt library that implements the Open Collaboration Services API'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kdesupport/attica'
-license=('LGPL')
-depends=('qt4')
-makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d62c5c9489a68432e8d990dde7680c24')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: attica/kde-unstable/PKGBUILD (from rev 202270, attica/trunk/PKGBUILD)
===================================================================
--- kde-unstable/PKGBUILD	                        (rev 0)
+++ kde-unstable/PKGBUILD	2013-12-21 15:07:16 UTC (rev 202389)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=attica
+#pkgname=('attica-qt4' 'attica-qt5')
+pkgname=('attica-qt5')
+pkgver=v0.4.2.r14.ga84850f
+pkgrel=1
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kdesupport/attica'
+license=('LGPL')
+#makedepends=('extra-cmake-modules' 'qt4' 'qt5-base' 'git')
+makedepends=('extra-cmake-modules' 'qt5-base' 'git')
+source=("git://anongit.kde.org/${pkgbase}.git")
+#source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('SKIP')
+
+pkgver() {
+  cd ${pkgbase}
+  git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+}
+
+prepare() {
+  mkdir build
+  mkdir build-qt5
+}
+
+build() {
+#  cd build
+#  cmake ../${pkgbase} \
+#    -DCMAKE_BUILD_TYPE=Release \
+#    -DCMAKE_INSTALL_PREFIX=/usr \
+#    -DATTICA_ENABLE_TESTS=OFF \
+#    -DQT4_BUILD=ON
+#  make
+
+  cd build-qt5
+  cmake ../${pkgbase} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/opt/kf5 \
+    -DATTICA_ENABLE_TESTS=OFF \
+    -DQT4_BUILD=OFF
+  make
+}
+
+package_attica-qt4() {
+  pkgdesc='A Qt4 library that implements the Open Collaboration Services API'
+  depends=('qt4')
+  provides=('attica')
+  conflicts=('attica')
+  replaces=('attica')
+
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
+
+package_attica-qt5() {
+  pkgdesc='A Qt5 library that implements the Open Collaboration Services API'
+  depends=('qt5-base')
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2013-12-21 15:05:12 UTC (rev 202388)
+++ trunk/PKGBUILD	2013-12-21 15:07:16 UTC (rev 202389)
@@ -1,63 +1,28 @@
 # $Id$
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
-pkgbase=attica
-#pkgname=('attica-qt4' 'attica-qt5')
-pkgname=('attica-qt5')
-pkgver=v0.4.2.r14.ga84850f
+pkgname=attica
+pkgver=0.4.2
 pkgrel=1
+pkgdesc='A Qt library that implements the Open Collaboration Services API'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kdesupport/attica'
 license=('LGPL')
-#makedepends=('extra-cmake-modules' 'qt4' 'qt5-base' 'git')
-makedepends=('extra-cmake-modules' 'qt5-base' 'git')
-source=("git://anongit.kde.org/${pkgbase}.git")
-#source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('SKIP')
+depends=('qt4')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('d62c5c9489a68432e8d990dde7680c24')
 
-pkgver() {
-  cd ${pkgbase}
-  git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
-}
-
-prepare() {
+build() {
   mkdir build
-  mkdir build-qt5
-}
-
-build() {
-#  cd build
-#  cmake ../${pkgbase} \
-#    -DCMAKE_BUILD_TYPE=Release \
-#    -DCMAKE_INSTALL_PREFIX=/usr \
-#    -DATTICA_ENABLE_TESTS=OFF \
-#    -DQT4_BUILD=ON
-#  make
-
-  cd build-qt5
-  cmake ../${pkgbase} \
+  cd build
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/opt/kf5 \
-    -DATTICA_ENABLE_TESTS=OFF \
-    -DQT4_BUILD=OFF
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
-package_attica-qt4() {
-  pkgdesc='A Qt4 library that implements the Open Collaboration Services API'
-  depends=('qt4')
-  provides=('attica')
-  conflicts=('attica')
-  replaces=('attica')
-
+package() {
   cd build
   make DESTDIR="${pkgdir}" install
 }
-
-package_attica-qt5() {
-  pkgdesc='A Qt5 library that implements the Open Collaboration Services API'
-  depends=('qt5-base')
-
-  cd build-qt5
-  make DESTDIR="${pkgdir}" install
-}