From: pawelz <pawelz@pld-linux.org>
Date: Mon, 26 Oct 2009 08:29:02 +0000 (+0000)
Subject: - use new cvs layout
X-Git-Tag: auto/th/fonts-TTF-microsoft-installer-20020525-9~4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffonts-TTF-microsoft.git;a=commitdiff_plain;h=a2f5f27dead3a5df4926dd9d31cfb235550a01c7

- use new cvs layout
- BR rpm-build-tools >= 0:4.4.35 (needs builder.sh that uses new cvs layout)

Changed files:
    fonts-TTF-microsoft.spec -> 1.37
    license-installer.sh -> 1.12
---

diff --git a/fonts-TTF-microsoft.spec b/fonts-TTF-microsoft.spec
index b72f1c8..8729a11 100644
--- a/fonts-TTF-microsoft.spec
+++ b/fonts-TTF-microsoft.spec
@@ -56,7 +56,7 @@ Requires:	fontpostinst
 %else
 Requires:	cabextract
 Requires:	mktemp > 1.5-18
-Requires:	rpm-build-tools
+Requires:	rpm-build-tools > 0:4.4.35
 %endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/license-installer.sh b/license-installer.sh
index 07b3cb1..27a0ac7 100644
--- a/license-installer.sh
+++ b/license-installer.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
 if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then
 	tmp=$(mktemp -d)
-	SPECDIR=`rpm --define "_topdir $tmp" --eval "%{_specdir}"`
 	SRPMDIR=`rpm --define "_topdir $tmp" --eval "%{_srcrpmdir}"`
-	SOURCEDIR=`rpm --define "_topdir $tmp" --eval "%{_sourcedir}"`
 	BUILDDIR=`rpm --define "_topdir $tmp" --eval "%{_builddir}"`
 	RPMDIR=`rpm --define "_topdir $tmp" --eval "%{_rpmdir}"`
-	mkdir -p $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR
+	PACKAGEDIR="$tmp/packages/acroread"
+	mkdir -p $SRPMDIR $RPMDIR $SRPMDIR $BUILDDIR $PACKAGEDIR
 
 	if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
 		(
@@ -16,20 +15,20 @@ if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then
 		else
 			cp -f "$3" $SRPMDIR
 		fi
-		rpm2cpio `basename "$3"` | ( cd $SPECDIR; cpio -i @BASE_NAME@.spec )
+		rpm2cpio `basename "$3"` | ( cd $PACKAGEDIR; cpio -i @BASE_NAME@.spec )
 		if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
-			rpm2cpio `basename "$3"` | ( cd $SOURCEDIR; cpio -i @COPYSOURCES@ )
+			rpm2cpio `basename "$3"` | ( cd $PACKAGEDIR; cpio -i @COPYSOURCES@ )
 		fi
 	   	)
 	else
-		cp -i "$3" $SPECDIR || exit 1
+		cp -i "$3" $PACKAGEDIR || exit 1
 		if [ '@COPYSOURCES@' != '@'COPYSOURCES'@' ]; then
 			for i in @COPYSOURCES@; do
-				cp -i @DATADIR@/$i $SOURCEDIR/$i || exit 1
+				cp -i @DATADIR@/$i $PACKAGEDIR/$i || exit 1
 			done
 		fi
 	fi
-	( cd $SPECDIR
+	( cd $PACKAGEDIR
 	nd=
 	if [ '@USE_DISTFILES@' = 'no' ]; then
 		nd=-nd