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

Andrea Scarpino andrea at archlinux.org
Mon Jun 6 06:09:29 UTC 2011


    Date: Monday, June 6, 2011 @ 02:09:28
  Author: andrea
Revision: 126535

KDE SC 4.6.4

Modified:
  kdeedu/trunk/PKGBUILD

----------+
 PKGBUILD |   68 ++++++++++++++++++++++++++-----------------------------------
 1 file changed, 29 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-06 06:09:24 UTC (rev 126534)
+++ PKGBUILD	2011-06-06 06:09:28 UTC (rev 126535)
@@ -5,7 +5,6 @@
 pkgbase=kdeedu
 pkgname=('kdeedu-blinken'
          'kdeedu-cantor'
-         'kdeedu-data'
          'kdeedu-kalgebra'
          'kdeedu-kalzium'
          'kdeedu-kanagram'
@@ -25,8 +24,8 @@
          'kdeedu-parley'
          'kdeedu-rocs'
          'kdeedu-step')
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -36,7 +35,7 @@
 	'python2' 'avogadro')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
         'gpsd-2.96.patch')
-sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396'
+sha1sums=('c58c2afbedccfa12d25e47202da995940cc9acb4'
           'fd6b6b81945d951bb6ad0bb735df33c11bb2008e')
 
 build() {
@@ -59,7 +58,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/blinken
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/blinken
+	cd $srcdir/build/blinken/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -72,24 +71,17 @@
 	install='kdeedu.install'
 	cd $srcdir/build/cantor
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/cantor
+	cd $srcdir/build/cantor/doc
 	make DESTDIR=$pkgdir install
 }
 
-package_kdeedu-data() {
-	pkgdesc='Data for KDE Educational Software'
-	groups=()
-	cd $srcdir/build/data
-	make DESTDIR=$pkgdir install
-}
-
 package_kdeedu-kalgebra() {
 	pkgdesc='Math Expression Solver and Plotter'
 	depends=('kdebase-runtime')
 	install='kdeedu.install'
 	cd $srcdir/build/kalgebra
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalgebra
+	cd $srcdir/build/kalgebra/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -99,17 +91,17 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kalzium
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kalzium
+	cd $srcdir/build/kalzium/doc
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-kanagram() {
 	pkgdesc='KDE Letter Order Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
 	install='kdeedu.install'
 	cd $srcdir/build/kanagram
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kanagram
+	cd $srcdir/build/kanagram/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -119,7 +111,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kbruch
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kbruch
+	cd $srcdir/build/kbruch/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -129,17 +121,17 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kgeography
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kgeography
+	cd $srcdir/build/kgeography/doc
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-khangman() {
 	pkgdesc='KDE Hangman Game'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
 	install='kdeedu.install'
 	cd $srcdir/build/khangman
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/khangman
+	cd $srcdir/build/khangman/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -149,7 +141,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kig
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kig
+	cd $srcdir/build/kig/doc
 	make DESTDIR=$pkgdir install
 
 	# Use the python2 executable
@@ -162,7 +154,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kiten
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kiten
+	cd $srcdir/build/kiten/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -172,7 +164,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/klettres
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/klettres
+	cd $srcdir/build/klettres/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -182,7 +174,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kmplot
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmplot
+	cd $srcdir/build/kmplot/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -192,7 +184,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kstars
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kstars
+	cd $srcdir/build/kstars/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -202,7 +194,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/ktouch
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ktouch
+	cd $srcdir/build/ktouch/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -212,17 +204,17 @@
 	install='kdeedu.install'
 	cd $srcdir/build/kturtle
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kturtle
+	cd $srcdir/build/kturtle/doc
 	make DESTDIR=$pkgdir install
 }
 
 package_kdeedu-kwordquiz() {
 	pkgdesc='A flashcard and vocabulary learning program'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu')
 	install='kdeedu.install'
 	cd $srcdir/build/kwordquiz
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kwordquiz
+	cd $srcdir/build/kwordquiz/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -231,10 +223,10 @@
 	groups=()
 	depends=('kdelibs')
 	install='kdeedu.install'
+    replaces=('kdeedu-data')
+    conflicts=('kdeedu-data')
 	cd $srcdir/build/libkdeedu
 	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake
 }
 
 package_kdeedu-marble() {
@@ -243,19 +235,17 @@
 	install='kdeedu.install'
 	cd $srcdir/build/marble
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/marble
+	cd $srcdir/build/marble/doc
 	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \
-		$pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake
 }
 
 package_kdeedu-parley() {
 	pkgdesc='Vocabulary Trainer'
-	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python')
+	depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python')
 	install='kdeedu.install'
 	cd $srcdir/build/parley
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/parley
+	cd $srcdir/build/parley/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -265,7 +255,7 @@
 	install='kdeedu.install'
 	cd $srcdir/build/rocs
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/rocs
+	cd $srcdir/build/rocs/doc
 	make DESTDIR=$pkgdir install
 }
 
@@ -275,6 +265,6 @@
 	install='kdeedu.install'
 	cd $srcdir/build/step
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/step
+	cd $srcdir/build/step/doc
 	make DESTDIR=$pkgdir install
 }




More information about the arch-commits mailing list