|
|
@@ -13,7 +13,7 @@ Summary: Package to assist installation of Adobe Flash Player (%{target_arch})
|
|
|
Summary(ja): Adobe Flash Player (%{target_arch}) のインストールを補助するパッケージ
|
|
|
Name: install-assist-%{pkgname}
|
|
|
Version: %{pkgversion}
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 3%{?_dist_release}
|
|
|
## This spec Source0 is obsolete
|
|
|
Source0: %{pkgname}.spec
|
|
|
License: Commercial
|
|
|
@@ -30,8 +30,16 @@ Requires: libXt
|
|
|
Requires: compat32-nss
|
|
|
Requires: compat32-libXt
|
|
|
Requires: compat32-alsa-lib
|
|
|
+#
|
|
|
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
|
|
|
Requires(post): nspluginwrapper
|
|
|
%endif
|
|
|
+%if %{?_dist_release} == "vl7"
|
|
|
+# Obsoletes: flash-plugin.32bit
|
|
|
+Obsoletes: flash-plugin <= 11.0.1.152-release
|
|
|
+%endif
|
|
|
+%endif
|
|
|
+
|
|
|
%ifarch %{ix86}
|
|
|
Conflicts: install-assist-flash-plugin9
|
|
|
%endif
|
|
|
@@ -72,16 +80,32 @@ Adobe Flash Player %{pkgversion} (%{target_arch})
|
|
|
/usr/lib/rpm/get-binary-rpm.sh %{name} %{dlurl}
|
|
|
|
|
|
%ifarch x86_64
|
|
|
+%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
|
|
|
/usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-release
|
|
|
/usr/bin/mozilla-plugin-config -i
|
|
|
exit 0
|
|
|
%endif
|
|
|
|
|
|
+# # FIXME: [ad-hoc] We have Obsoletes: flash-plugin.32bit. However,
|
|
|
+# # it do not remove flash-plugin.32bit.
|
|
|
+# %if %{?_dist_release} == "vl7"
|
|
|
+# if (rpm -q flash-plugin | grep -q "32bit"); then
|
|
|
+# rpm -e $(rpm -q flash-plugin | grep "32bit")
|
|
|
+# fi
|
|
|
+# %endif
|
|
|
+%endif
|
|
|
+
|
|
|
|
|
|
%files
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Oct 10 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-3
|
|
|
+- improved the installation of linux 64-bit flash-plugin for vl7 (x86_64)
|
|
|
+ - dropped Requires(post): nspluginwrapper
|
|
|
+ - added Obsoletes: flash-plugin <= 11.0.1.152-release
|
|
|
+ - fixed %%posttrans
|
|
|
+
|
|
|
* Thu Oct 6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-2
|
|
|
- supportted native linux 64-bit flash-plugin
|
|
|
|
munepi