[arch-commits] Commit in konversation/repos (extra-i686 extra-i686/PKGBUILD)

[Andrea Scarpino]

    Date: Thursday, February 11, 2010 @ 21:54:08
  Author: andrea
Revision: 68252

Merged revisions 61146-61147,63522,68251 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/konversation/trunk

........
  r61146 | andrea | 2009-12-12 16:32:02 +0100 (Sat, 12 Dec 2009) | 1 line
  
  prepare kde-unstable repo
........
  r61147 | andrea | 2009-12-12 16:34:00 +0100 (Sat, 12 Dec 2009) | 1 line
  
  undo
........
  r63522 | andrea | 2010-01-17 19:42:46 +0100 (Sun, 17 Jan 2010) | 1 line
  
  cleanup build
........
  r68251 | andrea | 2010-02-12 03:53:13 +0100 (Fri, 12 Feb 2010) | 2 lines
  
  upgpkg: konversation 1.2.2-1
      upstream release
........

Modified:
  konversation/repos/extra-i686/	(properties)
  konversation/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)


Property changes on: konversation/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /konversation/trunk:1-58707
   + /konversation/trunk:1-68251

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-12 02:53:13 UTC (rev 68251)
+++ extra-i686/PKGBUILD	2010-02-12 02:54:08 UTC (rev 68252)
@@ -4,17 +4,17 @@
 # Contributor: Sergio Jovani Guzman <moret at paretux.org>
 
 pkgname=konversation
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
 url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'libxss' 'kdepimlibs' 'qca')
+depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('automoc4' 'cmake' 'pkgconfig')
 license=('GPL2' 'FDL')
-install=konversation.install
+install=${pkgname}.install
 source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7d3c5d7f0062e8441b27ff549aa0029e')
+md5sums=('668e4aacfbb4521a3bf0ed53382fdf9f')
 
 build() {
   cd ${srcdir}
@@ -23,8 +23,11 @@
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
     -DCMAKE_INSTALL_PREFIX=/usr
-    make || return 1
-    make DESTDIR=${pkgdir} install || return 1
+  make || return 1
 }
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install || return 1
+}