updated install-assist-flash-plugin-vl.spec: new upstream release; support the native linux 64-bit flash-plugin; drop Requires(post): nspluginwrapper; keep compatibility for nspluginwrapper (for vl5, vl6)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5153 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/install-assist-flash-plugin/install-assist-flash-plugin-vl.spec

@@ -1,6 +1,6 @@
 %define pkgname flash-plugin
-%define pkgversion	11.0.1.152
-%define dlurl	http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-%{pkgversion}-release.%{target_arch}.rpm
+%define pkgversion	11.1.102.55
+%define dlurl	http://fpdownload.macromedia.com/get/flashplayer/pdc/%{pkgversion}/flash-plugin-%{pkgversion}-release.%{target_arch}.rpm
 
 %ifarch %{ix86}
 %define target_arch i386
@@ -13,9 +13,8 @@ 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: 	4%{?_dist_release}
-## This spec Source0 is obsolete
-Source0:	%{pkgname}.spec
+Release: 	1%{?_dist_release}
+
 License:	Commercial
 Group:		Applications/Internet
 
@@ -30,14 +29,12 @@ 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
+# NOTE: After releasing flash-plugin version 11.1.102.55, 
+# our vl5, vl6, vl7 (or higher) use the 64bit linux native flash-plugin. 
+# We need not some nspluginwrapper processes on the %%posttrans of 
+# this package. 
+##Requires(post):	nspluginwrapper
+Obsoletes:	flash-plugin < 11.1.102.55-release
 %endif
 
 %ifarch %{ix86}
@@ -71,7 +68,6 @@ Adobe Flash Player %{pkgversion} (%{target_arch})
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-#%{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -79,27 +75,31 @@ Adobe Flash Player %{pkgversion} (%{target_arch})
 %posttrans
 /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
+
+## compatibility for nspluginwrapper
+rpm --quiet -q nspluginwrapper
+[ $? -eq 1 ] && exit 0
+[ -f /etc/sysconfig/nspluginwrapper ] || exit 1
+# Check the list of plugins what are excluded from wrapping
+grep -q -e "libflashplayer" /etc/sysconfig/nspluginwrapper
+# If libflashplayer.so is a wrapped plugin of nspluginwrapper, ...
+[ $? -eq 1 ] && \
+    /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
+* Wed Nov 16 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.1.102.55-1
+- new upstream release
+- change %%dlurl
+- support the native linux 64-bit flash-plugin
+  - drop Requires(post): nspluginwrapper
+  - keep compatibility for nspluginwrapper (for vl5, vl6)
+
 * Tue Oct 11 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-4
 - changed to Obsoletes: flash-plugin < 11.0.1.152-release
 
@@ -110,7 +110,7 @@ exit 0
   - fixed %%posttrans
 
 * Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-2
-- supportted native linux 64-bit flash-plugin
+- supportted native linux 64-bit flash-plugin (for vl7)
 
 * Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-1
 - new upstream release