Changed files:
adobe-flash.spec -> 1.25
Name: %{base_name}-installer
%endif
Version: 7.0r25
Name: %{base_name}-installer
%endif
Version: 7.0r25
-Release: 2%{?with_license_agreement:wla}
+Release: 2%{?with_license_agreement:wla}.1
License: Free to use, non-distributable
Group: X11/Applications/Multimedia
%if %{with license_agreement}
License: Free to use, non-distributable
Group: X11/Applications/Multimedia
%if %{with license_agreement}
%if ! %{with license_agreement}
install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
%if ! %{with license_agreement}
install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{base_name}}
-cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
-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
+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
- mkdir -p \$TMPDIR \$SPECDIR \$SRPMDIR \$RPMDIR \$SRPMDIR \$SOURCEDIR \$BUILDDIR
- if [ -f \$SPECDIR/%{base_name}.spec ]; then
+ mkdir -p $TMPDIR $SPECDIR $SRPMDIR $RPMDIR $SRPMDIR $SOURCEDIR $BUILDDIR
+ if [ -f $SPECDIR/%{base_name}.spec ]; then
- mv -f \$SPECDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec.prev
+ mv -f $SPECDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec.prev
- if echo "\$3" | grep '\.src\.rpm$' >/dev/null; then
- ( cd \$SRPMDIR
- if echo "\$3" | grep '://' >/dev/null; then
- wget --passive-ftp -t0 "\$3"
+ if echo "$3" | grep '\.src\.rpm$' >/dev/null; then
+ ( cd $SRPMDIR
+ if echo "$3" | grep '://' >/dev/null; then
+ wget --passive-ftp -t0 "$3"
- rpm2cpio \`basename "\$3"\` | ( cd \$TMPDIR; cpio -i %{base_name}.spec )
+ rpm2cpio `basename "$3"` | ( cd $TMPDIR; cpio -i %{base_name}.spec )
- cp -i \$TMPDIR/%{base_name}.spec \$SPECDIR/%{base_name}.spec \
- || exit 1
+ cp -i $TMPDIR/%{base_name}.spec $SPECDIR/%{base_name}.spec || exit 1
- cp -i "\$3" \$SPECDIR || exit 1
+ cp -i "$3" $SPECDIR || exit 1
%{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec
%{_bindir}/builder -nc -ncs --with license_agreement --opts --target=%{_target_cpu} %{base_name}.spec
- if [ "\$?" -ne 0 ]; then
+ if [ "$?" -ne 0 ]; then
exit 2
fi
RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
exit 2
fi
RPMNAME1=mozilla-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
RPMNAMES=
if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then
RPMNAME3=konqueror-plugin-macromedia-flash-%{version}-%{release}wla.%{_target_cpu}.rpm
RPMNAMES=
if rpm -q --whatprovides mozilla-embedded >/dev/null 2>&1; then
- RPMNAMES=\$RPMDIR/\$RPMNAME1
- echo "Installing \$RPMNAME1"
+ RPMNAMES=$RPMDIR/$RPMNAME1
+ echo "Installing $RPMNAME1"
- echo "Not installing \$RPMNAME1"
+ echo "Not installing $RPMNAME1"
fi
if rpm -q mozilla-firefox >/dev/null 2>&1; then
fi
if rpm -q mozilla-firefox >/dev/null 2>&1; then
- RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME2"
- echo "Installing \$RPMNAME2"
+ RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME2"
+ echo "Installing $RPMNAME2"
- echo "Not installing \$RPMNAME2"
+ echo "Not installing $RPMNAME2"
fi
if rpm -q konqueror >/dev/null 2>&1; then
fi
if rpm -q konqueror >/dev/null 2>&1; then
- RPMNAMES="\$RPMNAMES \$RPMDIR/\$RPMNAME3"
- echo "Installing \$RPMNAME3"
+ RPMNAMES="$RPMNAMES $RPMDIR/$RPMNAME3"
+ echo "Installing $RPMNAME3"
- echo "Not installing \$RPMNAME3"
+ echo "Not installing $RPMNAME3"
- 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
+ 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
this package by default. If you want to create full working
package please build it with the following command:
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
+$0 --with license_agreement %{_datadir}/%{base_name}/%{base_name}.spec