- use shared installer script from SOURCES

Changed files:
    adobe-flash.spec -> 1.28

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 4b2e79e318f33f18d81b1088f6b4720b07f4d594..62fb1e1ef099de56eb623ffb7df91656849454c1 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -11,12 +11,14 @@ Name:               %{base_name}
 Name:          %{base_name}-installer
 %endif
 Version:       7.0r25
-Release:       2.13%{?with_license_agreement:wla}
+Release:       2.17%{?with_license_agreement:wla}
 License:       Free to use, non-distributable
 Group:         X11/Applications/Multimedia
 %if %{with license_agreement}
 Source0:       http://fpdownload.macromedia.com/get/shockwave/flash/english/linux/%{version}/install_flash_player_7_linux.tar.gz
 # NoSource0-md5:       79c59a5ea29347e01c8e6575dd054cd1
+%else
+Source0:       license-installer.sh
 %endif
 URL:           http://www.macromedia.com/software/flash/
 BuildRequires: rpmbuild(macros) >= 1.224
@@ -57,57 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 %if %{without license_agreement}
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
 
-cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
-#!/bin/sh
-if [ "$1" = "--with" -a "$2" = "license_agreement" ]; then
-       TMPDIR=`rpm --eval "%%{tmpdir}"`; export TMPDIR
-       SPECDIR=`rpm --eval "%%{_specdir}"`; export SPECDIR
-       SRPMDIR=`rpm --eval "%%{_srcrpmdir}"`; export SRPMDIR
-       SOURCEDIR=`rpm --eval "%%{_sourcedir}"`; export SOURCEDIR
-       BUILDDIR=`rpm --eval "%%{_builddir}"`; export BUILDDIR
-       RPMDIR=`rpm --eval "%%{_rpmdir}"`; export RPMDIR
-       BACKUP=0
-       mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR
-       if [ -f $SPECDIR/%{base_name}.spec ]; then
-               BACKUP=1
-               mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev
-       fi
-       if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
-               ( cd $SRPMDIR
-               if echo "$3" | grep '://' >/dev/null; then
-                       wget --passive-ftp -t0 "$3"
-               else
-                       cp -f "$3" .
-               fi
-               rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec )
-               )
-               cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1
-       else
-               cp -i "$3" $SPECDIR || exit 1
-       fi
-       ( cd $SPECDIR
-       %{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec
-       if [ "$?" -ne 0 ]; then
-               exit 2
-       fi
-       RPMNAME=%{base_name}-%{version}-%{release}wla.%{_target_cpu}.rpm
-       RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME"
-       rpm -U $RPMNAMES || echo -e "Install manually the file(s):\n   $RPMNAMES" )
-       if [ "$BACKUP" -eq 1 ]; then
-               if [ -f $SPECDIR/%{base_name}.spec.prev ]; then
-                       mv -f $SPECDIR/%{base_name}.spec.prev $SPECDIR/%{base_name}.spec
-               fi
-       fi
-else
-       echo "
-License issues made us not to include inherent files into
-this package by default. If you want to create full working
-package please build it with the following command:
-
-$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
-"
-fi
-EOF
+sed -e '
+       s/@BASE_NAME@/%{base_name}/g
+       s/@TARGET_CPU@/%{_target_cpu}/g
+       s-@VERSION@-%{version}-g
+       s-@RELEASE@-%{release}-g
+       s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
+' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
@@ -123,13 +81,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{without license_agreement}
 %pre
-echo "
-License issues made us not to include inherent files into
-this package by default. If you want to create full working
-package please build it with the following command:
+%{_bindir}/%{base_name}.install
 
-%{base_name}.install --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec
-"
 %else
 
 %triggerin -- mozilla-firefox