packages: repackage.sh - grap specdir

glen glen at pld-linux.org
Wed Apr 29 09:06:40 CEST 2009


Author: glen                         Date: Wed Apr 29 07:06:40 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- grap specdir

---- Files affected:
packages:
   repackage.sh (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/repackage.sh
diff -u packages/repackage.sh:1.29 packages/repackage.sh:1.30
--- packages/repackage.sh:1.29	Fri Nov  7 02:35:02 2008
+++ packages/repackage.sh	Wed Apr 29 09:06:35 2009
@@ -21,13 +21,18 @@
 
 rpmbuild() {
 	# preprocess args, we must have --target as first arg to rpmbuild
-	local a
+	# we need to grab also dir where spec resides
+	local a spec specdir
 	while [ $# -gt 0 ]; do
 		case "$1" in
 		--target)
 			shift
 			TARGET=$1
 			;;
+		*.spec)
+			spec="$1"
+			a="$a $1"
+			;;
 		*)
 			a="$a $1"
 			;;
@@ -35,6 +40,8 @@
 		shift
 	done
 
+    specdir=$(dirname "$(pwd)/${spec:-.}")
+
 	# use gz payload as time is what we need here, not compress ratio
 
 	# we use %__ldconfig variable to test are we on rpm 4.4.9
@@ -44,6 +51,7 @@
 	/usr/bin/rpmbuild \
 		${TARGET:+--target $TARGET} \
 		--short-circuit \
+		--define "_specdir $specdir" --define "_sourcedir $specdir" \
 		--define 'clean %%%{!?__ldconfig:clean}%{?__ldconfig:check} \
 		exit 0%{nil}' \
 		--define 'check %%check \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/repackage.sh?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list