[arch-commits] Commit in signon/trunk (PKGBUILD)

[Felix Yan]

    Date: Saturday, February 21, 2015 @ 15:58:39
  Author: fyan
Revision: 231715

upgpkg: signon 8.57-2

drop qt4 daemon (FS#43864)

Modified:
  signon/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-21 14:32:42 UTC (rev 231714)
+++ PKGBUILD	2015-02-21 14:58:39 UTC (rev 231715)
@@ -3,9 +3,9 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
-pkgname=('signon-qt4' 'signon-qt5')
+pkgname=('libsignon-qt4' 'signon')
 pkgver=8.57
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
@@ -22,7 +22,7 @@
   patch -Np1 -i "$srcdir/use_keyring.patch"
   cd ..
 
-  cp -r $pkgbase-$pkgver $pkgbase-$pkgver-qt4
+  cp -a $pkgbase-$pkgver $pkgbase-$pkgver-qt4
 
   # qt4 fix
   cd $pkgbase-$pkgver-qt4
@@ -33,22 +33,19 @@
   cd $pkgbase-$pkgver
   qmake PREFIX=/usr LIBDIR=/usr/lib
   make
-  cd ..
-
-  cd $pkgbase-$pkgver-qt4
+    
+  cd ../$pkgbase-$pkgver-qt4
   qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
-package_signon-qt4() {
-  pkgdesc="Qt4 Framework to provide credential storage and authentication service"
-  depends=('qt4' 'libproxy')
-  install=$pkgbase.install
-  provides=('signon')
-  replaces=('signon' 'signon-doc')
-  conflicts=('signon' 'signon-doc' 'signon-qt5')
+package_libsignon-qt4() {
+  pkgdesc="Qt4 signon library"
+  depends=('qt4' 'signon')
+  conflicts=('signon-qt4')
+  replaces=('signon-qt4')
 
-  cd $pkgbase-$pkgver-qt4
+  cd $pkgbase-$pkgver-qt4/lib/SignOn
   make INSTALL_ROOT="$pkgdir" install
 
   # Do not ship docs
@@ -55,11 +52,12 @@
   rm -rf "${pkgdir}"/usr/share/doc
 }
 
-package_signon-qt5() {
-  pkgdesc="Qt5 Framework to provide credential storage and authentication service"
+package_signon() {
+  pkgdesc="Qt Framework to provide credential storage and authentication service"
   depends=('qt5-base' 'libproxy')
-  install=$pkgbase.install
-  conflicts=('signon' 'signon-qt4')
+  conflicts=('signon-qt5')
+  provides=('signon-qt5')
+  replaces=('signon-qt5')
 
   cd $pkgbase-$pkgver
   make INSTALL_ROOT="$pkgdir" install
@@ -67,3 +65,4 @@
   # Do not ship docs
   rm -rf "${pkgdir}"/usr/share/doc
 }
+