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

[Giovanni Scafora]

    Date: Saturday, October 10, 2009 @ 12:23:50
  Author: giovanni
Revision: 54488

Merged revisions 54383,54390 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/konversation/trunk

........
  r54383 | andrea | 2009-10-09 17:30:42 -0700 (ven, 09 ott 2009) | 2 lines
  
  upgpkg: konversation 1.2-1
      upstream release
........
  r54390 | andrea | 2009-10-10 03:40:29 -0700 (sab, 10 ott 2009) | 2 lines
  
  upgpkg: konversation 1.2-2
      FS#16552
........

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

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


Property changes on: konversation/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /konversation/trunk:1-53919
   + /konversation/trunk:1-54487

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-10 16:08:59 UTC (rev 54487)
+++ extra-x86_64/PKGBUILD	2009-10-10 16:23:50 UTC (rev 54488)
@@ -4,9 +4,8 @@
 # Contributor: Sergio Jovani Guzman <moret at paretux.org>
 
 pkgname=konversation
-pkgver=1.2.rc1
-_pkgver=1.2-rc1
-pkgrel=1
+pkgver=1.2
+pkgrel=2
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
 url="http://konversation.kde.org"
@@ -14,16 +13,15 @@
 makedepends=('automoc4' 'cmake' 'pkgconfig')
 license=('GPL2' 'FDL')
 install=konversation.install
-source=(http://download.kde.org/unstable/${pkgname}/${_pkgver}/src/${pkgname}-${_pkgver}.tar.bz2)
-md5sums=('9a672517399354296ec13a9368cbfcb8')
+source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('823d06b20161526bb20bd50086a73af1')
+options=('force')
 
 build() {
   cd ${srcdir}
-
   mkdir build
   cd build
-
-  cmake ../${pkgname}-${_pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \