moved python setup.py support into scripts/functions - obsoleting some

$pkg.conf files


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1332 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -1,4 +1,10 @@
 
+*) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
+
+ - Sebastian Jaenicke: slrn patches
+ - moved python setup.py support into scripts/functions - obsoleting some
+   $pkg.conf files
+
 *) 2003-09-06 (2.0.0-rc1 - 2.0.0-rc2)
 
  - fixed nvrec and libsdl_gfx for non x86 builds

package/base/python/python-pkg.conf

@@ -1,30 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/python/python-pkg.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-pyconfopt="--prefix $root/$prefix"
-python_pkg_main() {
-	python setup.py build install $pyconfopt
-}
-
-custmain=python_pkg_main
-

package/jsaw/gnuplotpy/gnuplotpy.conf

@@ -1,24 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jsaw/python/gnuplotpy/gnuplotpy.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. package/*/*/python-pkg.conf

package/jsaw/numpy/numpy.conf

@@ -21,14 +21,11 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-. package/*/*/python-pkg.conf
-
-numpy_main() {
-	python_pkg_main
 
+numpy_pi() {
 	echo "Copying tutorial...."
 	#@FIXME
 	cp -av Demo/NumTut /usr/lib/python*/site-packages/
 }
 
-custmain=numpy_main
+hook_add postinstall 3 numpy_main

package/jsaw/pynumarray/pynumarray.conf

@@ -1,24 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jsaw/python/pynumarray/pynumarray.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. package/*/*/python-pkg.conf

package/jsaw/pytables/pytables.conf

@@ -1,24 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jsaw/python/pytables/pytables.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. package/*/*/python-pkg.conf

package/jsaw/scientificpy/scientificpy.conf

@@ -1,24 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jsaw/python/scientificpy/scientificpy.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. package/*/*/python-pkg.conf

package/mathieu/bittorrent/bittorrent.conf

@@ -1,24 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mathieu/bittorrent/bittorrent.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. package/*/*/python-pkg.conf

package/mathieu/duplicity/duplicity.conf

@@ -1,24 +0,0 @@
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/mathieu/duplicity/duplicity.conf
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-. package/*/*/python-pkg.conf

scripts/functions

@@ -533,15 +533,24 @@ build_this_package() {
 			     -f Imakefile -a $runxmkmf = 1 ]; then
 				xmkmf -a
 			fi
+			#
+			if [ -f Makefile -o -f makefile ] ; then
+				# Build it
+				#		
+				hook_eval premake
+				if [ "$makeopt"     ]
+				then eval "$MAKE $makeopt"; fi
+				hook_eval inmake
+				if [ "$makeinstopt" ]
+				then eval "$MAKE $makeinstopt"; fi
+				hook_eval postmake
+			elif [ -f setup.py  ] ; then
+				pyconfopt="${pyconfopt:=--prefix $root/$prefix}"
+				eval python setup.py build install $pyconfopt
+			else
+				abort "Build type not determined / supported!"
 
-			# Build it
-			#		
-			hook_eval premake
-			if [ "$makeopt"     ]; then eval "$MAKE $makeopt"; fi
-			hook_eval inmake
-			if [ "$makeinstopt" ]; then eval "$MAKE $makeinstopt"; fi
-			hook_eval postmake
-
+			fi
 		else
 			eval "$custmain"
 			for x in preconf premake inmake postmake; do