[arch-commits] Commit in kdeedu/trunk (PKGBUILD python-2.6.patch)

[Pierre Schmitz]

    Date: Wednesday, January 7, 2009 @ 17:39:36
  Author: pierre
Revision: 23298

preapre for 4.1.4

Modified:
  kdeedu/trunk/PKGBUILD
Deleted:
  kdeedu/trunk/python-2.6.patch

------------------+
 PKGBUILD         |   12 ++++--------
 python-2.6.patch |   12 ------------
 2 files changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-07 22:39:32 UTC (rev 23297)
+++ PKGBUILD	2009-01-07 22:39:36 UTC (rev 23298)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdeedu
-pkgver=4.1.3
+pkgver=4.1.4
 pkgrel=1
 pkgdesc="KDE Educational programs"
 arch=('i686' 'x86_64')
@@ -13,13 +13,11 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'eigen' 'cfitsio' 'gmm++')
 options=('docs')
 install='kdeedu.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'python-2.6.patch')
-md5sums=('8b513d6dde79119842eef059550c0123' 'b02494e14cfb969faed5a279b0ee4aa2')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('28840fa475571184994824d12a0b7684')
 
 build() {
-	cd $srcdir/${pkgname}-${pkgver}
-	patch -p1 -i $srcdir/python-2.6.patch || return 1
-	cd ../
+	cd $srcdir
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -27,6 +25,4 @@
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 	make DESTDIR=$pkgdir install
-	# provided by indilib
-	rm -f $pkgdir/usr/bin/indiserver
 }

Deleted: python-2.6.patch
===================================================================
--- python-2.6.patch	2009-01-07 22:39:32 UTC (rev 23297)
+++ python-2.6.patch	2009-01-07 22:39:36 UTC (rev 23298)
@@ -1,12 +0,0 @@
-diff -Nura kdeedu-4.1.3.orig/cmake/modules/FindBoostPython.cmake kdeedu-4.1.3/cmake/modules/FindBoostPython.cmake
---- kdeedu-4.1.3.orig/cmake/modules/FindBoostPython.cmake	2008-01-29 10:17:21.000000000 +0100
-+++ kdeedu-4.1.3/cmake/modules/FindBoostPython.cmake	2008-10-31 03:20:55.000000000 +0100
-@@ -25,7 +25,7 @@
- set(BOOST_PYTHON_LIBS)
- 
- # handy arrays
--set(PYTHON_VERSIONS "python;python2.5;python2.4;python2.3;python2.2")
-+set(PYTHON_VERSIONS "python;python2.6;python2.5;python2.4;python2.3;python2.2")
- set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include")
- set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config")
- set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python")