packages: adobe-flash/adobe-flash.spec, adobe-flash/license-installer.sh - ...

[arekm]

Author: arekm                        Date: Sun Aug  9 19:56:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix installer script

---- Files affected:
packages/adobe-flash:
   adobe-flash.spec (1.123 -> 1.124) , license-installer.sh (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/adobe-flash/adobe-flash.spec
diff -u packages/adobe-flash/adobe-flash.spec:1.123 packages/adobe-flash/adobe-flash.spec:1.124
--- packages/adobe-flash/adobe-flash.spec:1.123	Fri Jul 31 13:25:34 2009
+++ packages/adobe-flash/adobe-flash.spec	Sun Aug  9 21:56:10 2009
@@ -15,7 +15,7 @@
 %endif
 
 %define		base_name	adobe-flash
-%define		rel 1
+%define		rel 2
 Summary:	Flash plugin for Netscape-compatible WWW browsers
 Summary(pl.UTF-8):	Wtyczka Flash dla przeglądarek WWW zgodnych z Netscape
 %if %{with license_agreement}
@@ -151,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2009/08/09 19:56:10  arekm
+- rel 2; fix installer script
+
 Revision 1.123  2009/07/31 11:25:34  glen
 - version check
 

================================================================
Index: packages/adobe-flash/license-installer.sh
diff -u packages/adobe-flash/license-installer.sh:1.11 packages/adobe-flash/license-installer.sh:1.12
--- packages/adobe-flash/license-installer.sh:1.11	Sat Apr 22 20:44:56 2006
+++ packages/adobe-flash/license-installer.sh	Sun Aug  9 21:56:10 2009
@@ -1,9 +1,9 @@
 #!/bin/sh
 if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then
 	tmp=$(mktemp -d)
-	SPECDIR=`rpm --define "_topdir $tmp" --eval "%{_specdir}"`
+	SPECDIR="$tmp/packages/@BASE_NAME@"
+	SOURCEDIR="$tmp/packages/@BASE_NAME@"
 	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adobe-flash/adobe-flash.spec?r1=1.123&r2=1.124&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adobe-flash/license-installer.sh?r1=1.11&r2=1.12&f=u