[arch-commits] Commit in quassel/trunk (4 files)

[Jelle van der Waa]

    Date: Sunday, May 26, 2013 @ 21:21:59
  Author: jelle
Revision: 91732

upgpkg: quassel 0.9.0-1

split in two packages #28384 and removing initscripts #33509

Added:
  quassel/trunk/quassel-client.install
Modified:
  quassel/trunk/PKGBUILD
  quassel/trunk/quassel.install
Deleted:
  quassel/trunk/rc.quassel

------------------------+
 PKGBUILD               |   84 ++++++++++++++++++++++++++++++++++-------------
 quassel-client.install |    9 +++++
 quassel.install        |    7 ---
 rc.quassel             |   41 ----------------------
 4 files changed, 72 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-26 17:21:25 UTC (rev 91731)
+++ PKGBUILD	2013-05-26 19:21:59 UTC (rev 91732)
@@ -2,49 +2,89 @@
 # Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
 # Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
 
-pkgname=quassel
-pkgver=0.8.0
-pkgrel=2
+pkgbase=quassel
+pkgname=('quassel-client' 'quassel-core')
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="QT4 irc client with a separated core"
 arch=('i686' 'x86_64')
 url="http://quassel-irc.org/"
 license=('GPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=quassel.install
-backup=(etc/conf.d/quassel)
-source=("http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2"
+makedepends=('cmake' 'automoc4' 'qt4' 'icu')
+source=("http://quassel-irc.org/pub/quassel-$pkgver.tar.bz2"
         'quassel.service'
-        'rc.quassel'
         'quassel.conf')
-sha256sums=('a3515bd18e2b100eb9a72480e76b1faefaa5e84cdb236b6af1f05b477a1e9071'
+
+sha256sums=('2e3fe06ae3731c829aa3c2f6bb5320619bad264c831f322985c3aa3fe58b6027'
             '91a1aaae47d41c11aa418dd560039ddbbfb659e02b86379d8c4789c5ada362d3'
-            '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0'
             'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
-
 build() {
+  cd $srcdir
   [[ ! -d build ]] && mkdir build
+  mkdir build-client
+
+  # Core
   cd build
 
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr/ \
-    -DWITH_KDE=1 \
+    -DWITH_KDE=0 \
     -DCMAKE_BUILD_TYPE="Release" \
-    ../${pkgname}-${pkgver}/ \
+    -DWITH_OPENSSL=ON \
+    -DWANT_CORE=ON \
+    -DWANT_MONO=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWITH_DBUS=OFF \
+    -DWITH_OXYGEN=OFF \
+    -DWITH_PHONON=OFF \
+    -DWITH_WEBKIT=OFF \
+    -DCMAKE_BUILD_TYPE="Release" \
+    ../quassel-${pkgver}/ \
     -Wno-dev
 
   make
+
+  # Client
+  cd $srcdir/build-client
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DWITH_KDE=0 \
+    -DWITH_OPENSSL=ON \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=ON \
+    -DWANT_MONO=ON \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+
+  make
+  
 }
 
-package() {
-  cd build
+package_quassel-core() {
+pkgdesc="Qt4 IRC client with a separated core - core only"
+depends=('qt4' 'icu')
+backup=(etc/conf.d/quassel)
+install=quassel.install
+  cd $srcdir/build
 
   make DESTDIR="${pkgdir}" install
+  
+  # Remove unneeded pixmap icons
+  rm -r $pkgdir/usr/share
 
-  install -Dm644 "${srcdir}"/$pkgname.service \
-    "${pkgdir}"/usr/lib/systemd/system/$pkgname.service
-  install -D "${srcdir}"/rc.$pkgname \
-    "${pkgdir}"/etc/rc.d/$pkgname
-  install -Dm644 "${srcdir}"/$pkgname.conf \
-    "${pkgdir}"/etc/conf.d/$pkgname
+
+  install -Dm644 "${srcdir}"/$pkgbase.service \
+    "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
+  install -Dm644 "${srcdir}"/$pkgbase.conf \
+    "${pkgdir}"/etc/conf.d/$pkgbase
 }
+
+package_quassel-client() {
+pkgdesc="Qt4 IRC client with a separated core - client only"
+depends=('qt4')
+install=quassel-client.install
+  cd $srcdir/build-client
+
+  make DESTDIR=${pkgdir} install
+}

Added: quassel-client.install
===================================================================
--- quassel-client.install	                        (rev 0)
+++ quassel-client.install	2013-05-26 19:21:59 UTC (rev 91732)
@@ -0,0 +1,9 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+post_upgrade() {
+    post_install
+}
+post_remove() {
+    post_install
+}

Modified: quassel.install
===================================================================
--- quassel.install	2013-05-26 17:21:25 UTC (rev 91731)
+++ quassel.install	2013-05-26 19:21:59 UTC (rev 91732)
@@ -1,7 +1,7 @@
 post_install() {
   useradd -r -s /bin/sh -d /var/lib/quassel quassel
   mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
@@ -12,15 +12,10 @@
 ==> - quasselcore now listens to port 127.0.0.1 by default
 ==> - both of above are configurable: /etc/conf.d/quassel
 EOF
-    /etc/rc.d/quassel stop
     post_install
   ) || true
 }
 
-pre_remove() {
-  /etc/rc.d/quassel stop
-}
-
 post_remove() {
   userdel quassel
 }

Deleted: rc.quassel
===================================================================
--- rc.quassel	2013-05-26 17:21:25 UTC (rev 91731)
+++ rc.quassel	2013-05-26 19:21:59 UTC (rev 91732)
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/quassel
-
-PIDFILE=/var/run/quassel.pid
-PID=`pidof -o %PPID /usr/bin/quasselcore`
-
-case "$1" in
-  start)
-    stat_busy "Starting Quassel Core"
-    [ -z "$PID" ] && su -l -c "/usr/bin/quasselcore --configdir=/var/lib/quassel --listen=$LISTEN &" $QUASSEL_USER &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > $PIDFILE
-      add_daemon quassel
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Quassel Core"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f $PIDFILE
-      rm_daemon quassel
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0