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

2018-01-16 Thread Eli Schwartz via arch-commits
Date: Wednesday, January 17, 2018 @ 03:53:52
  Author: eschwartz
Revision: 283527

upgpkg: quassel 0.12.4-4

migrate to systemd-sysusers/systemd-tmpfiles
use HTTPS for url and source downloads

Added:
  quassel/trunk/quassel.sysusers
  quassel/trunk/quassel.tmpfiles
Modified:
  quassel/trunk/PKGBUILD
Deleted:
  quassel/trunk/quassel.install

--+
 PKGBUILD |   15 +++
 quassel.install  |4 
 quassel.sysusers |1 +
 quassel.tmpfiles |1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-16 22:00:38 UTC (rev 283526)
+++ PKGBUILD2018-01-17 03:53:52 UTC (rev 283527)
@@ -5,21 +5,25 @@
 pkgbase=quassel
 pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 
'quassel-monolithic')
 pkgver=0.12.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Next-generation distributed IRC client"
 arch=('x86_64')
-url="http://quassel-irc.org/;
+url="https://quassel-irc.org/;
 license=('GPL')
 makedepends=('qt5-base' 'qt5-tools' 'qt5-webkit' 'qca-qt5' 'qt5-script'
  'knotifyconfig' 'cmake' 'extra-cmake-modules' 'python'
  'hicolor-icon-theme')
-source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+source=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
 0001-Fix-handling-systray-notifications.patch
 $pkgbase.service
+$pkgbase.sysusers
+$pkgbase.tmpfiles
 $pkgbase.conf)
 sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
 '5a465f33c5f233983a12139a1a121665c4ddab9e205997daa453dcffd255156a'
 '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+'3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'
+'2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'
 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
 
 prepare() {
@@ -75,7 +79,6 @@
 depends=('icu' 'qca-qt5' 'qt5-script')
 optdepends=('postgresql: PostgreSQL database support')
 backup=(etc/conf.d/quassel)
-install=$pkgbase.install
   cd "${srcdir}"/build-core
 
   make DESTDIR="${pkgdir}" install
@@ -83,6 +86,10 @@
   # Remove unneeded pixmap icons
   rm -r "${pkgdir}"/usr/share
 
+  install -Dm644 "${srcdir}"/$pkgbase.sysusers \
+"${pkgdir}"/usr/lib/sysusers.d/$pkgbase.conf
+  install -Dm644 "${srcdir}"/$pkgbase.tmpfiles \
+"${pkgdir}"/usr/lib/tmpfiles.d/$pkgbase.conf
   install -Dm644 "${srcdir}"/$pkgbase.service \
 "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service
   install -Dm644 "${srcdir}"/$pkgbase.conf \

Deleted: quassel.install
===
--- quassel.install 2018-01-16 22:00:38 UTC (rev 283526)
+++ quassel.install 2018-01-17 03:53:52 UTC (rev 283527)
@@ -1,4 +0,0 @@
-post_install() {
-  getent passwd quassel >/dev/null || useradd -r -s /bin/false -d 
/var/lib/quassel quassel
-  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
-}

Added: quassel.sysusers
===
--- quassel.sysusers(rev 0)
+++ quassel.sysusers2018-01-17 03:53:52 UTC (rev 283527)
@@ -0,0 +1 @@
+u quassel - - /var/lib/quassel

Added: quassel.tmpfiles
===
--- quassel.tmpfiles(rev 0)
+++ quassel.tmpfiles2018-01-17 03:53:52 UTC (rev 283527)
@@ -0,0 +1 @@
+d /var/lib/quassel - quassel quassel - -


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

2016-05-04 Thread Jaroslav Lichtblau
Date: Thursday, May 5, 2016 @ 00:07:36
  Author: jlichtblau
Revision: 173770

upgpkg: quassel 0.12.4-1 - new upstream release

Modified:
  quassel/trunk/PKGBUILD
  quassel/trunk/quassel.install
Deleted:
  quassel/trunk/quassel-client.install
  quassel/trunk/quassel-monolithic.install

+
 PKGBUILD   |7 +++
 quassel-client.install |9 -
 quassel-monolithic.install |9 -
 quassel.install|1 -
 4 files changed, 3 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-04 20:36:56 UTC (rev 173769)
+++ PKGBUILD2016-05-04 22:07:36 UTC (rev 173770)
@@ -10,7 +10,8 @@
 arch=('i686' 'x86_64')
 url="http://quassel-irc.org/;
 license=('GPL')
-makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools' 'qca-qt5' 
'qt5-script' 'knotifyconfig')
+makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools'
+ 'qca-qt5' 'qt5-script' 'knotifyconfig' 'python')
 source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
 $pkgbase.service
 $pkgbase.conf)
@@ -82,7 +83,7 @@
 depends=('icu' 'qca-qt5' 'qt5-script')
 optdepends=('postgresql: PostgreSQL database support')
 backup=(etc/conf.d/quassel)
-install=quassel.install
+install=$pkgbase.install
   cd "${srcdir}"/build
 
   make DESTDIR="${pkgdir}" install
@@ -100,7 +101,6 @@
 pkgdesc="Next-generation distributed IRC client - client only"
 depends=('qt5-base' 'qt5-webkit' 'knotifyconfig')
 conflicts=('quassel-monolithic')
-install=quassel-client.install
   cd "${srcdir}"/build-client
 
   make DESTDIR="${pkgdir}" install
@@ -111,7 +111,6 @@
 depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig')
 optdepends=('postgresql: PostgreSQL database support')
 conflicts=('quassel-client')
-install=quassel-monolithic.install
   cd "${srcdir}"/build-mono
 
   make DESTDIR="${pkgdir}" install

Deleted: quassel-client.install
===
--- quassel-client.install  2016-05-04 20:36:56 UTC (rev 173769)
+++ quassel-client.install  2016-05-04 22:07:36 UTC (rev 173770)
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-post_upgrade() {
-post_install
-}
-post_remove() {
-post_install
-}

Deleted: quassel-monolithic.install
===
--- quassel-monolithic.install  2016-05-04 20:36:56 UTC (rev 173769)
+++ quassel-monolithic.install  2016-05-04 22:07:36 UTC (rev 173770)
@@ -1,9 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-post_upgrade() {
-post_install
-}
-post_remove() {
-post_install
-}

Modified: quassel.install
===
--- quassel.install 2016-05-04 20:36:56 UTC (rev 173769)
+++ quassel.install 2016-05-04 22:07:36 UTC (rev 173770)
@@ -1,7 +1,6 @@
 post_install() {
   useradd -r -s /bin/false -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
 }
 
 post_upgrade() {


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

2013-05-26 Thread 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
===
--- PKGBUILD2013-05-26 17:21:25 UTC (rev 91731)
+++ PKGBUILD2013-05-26 19:21:59 UTC (rev 91732)
@@ -2,49 +2,89 @@
 # Maintainer: Vesa Kaihlavirta ve...@iki.fi
 # Maintainer: Jaroslav Lichtblau dragonl...@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