SPECS: acroread.spec - release 2.1 - use browser-plugins framework

[baggins]

Author: baggins                      Date: Fri Dec  9 13:30:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 2.1
- use browser-plugins framework

---- Files affected:
SPECS:
   acroread.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/acroread.spec
diff -u SPECS/acroread.spec:1.46 SPECS/acroread.spec:1.47
--- SPECS/acroread.spec:1.46	Sun Aug 28 22:07:12 2005
+++ SPECS/acroread.spec	Fri Dec  9 14:30:00 2005
@@ -14,7 +14,7 @@
 Name:		%{base_name}-installer
 %endif
 Version:	7.0.1
-Release:	2%{?with_license_agreement:wla}
+Release:	2.1%{?with_license_agreement:wla}
 Epoch:		1
 License:	distribution restricted (http://www.adobe.com/products/acrobat/distribute.html)
 # in short:
@@ -33,8 +33,6 @@
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		mozdir		%{_libdir}/mozilla/plugins
-
 %define		platform	intellinux
 %define		tar0		ILINXR.TAR
 %define		tar1		COMMON.TAR
@@ -60,17 +58,19 @@
 đŇĎÇŇÁÍÁ ÄĚŃ ŢÉÔÁÎÎŃ ÄĎËŐÍĹÎÔŚ× Ő ĆĎŇÍÁÔŚ Portable Document Format
 (PDF), ÚÇĹÎĹŇĎ×ÁÎÉČ Adobe Acrobat'ĎÍ.
 
-%package -n mozilla-plugin-%{base_name}
-Summary:	Mozilla PDF plugin
-Summary(pl):	Wtyczka PDF do Mozilli
+%package plugin
+Summary:	PDF plugin for Mozilla compatible browsers
+Summary(pl):	Wtyczka PDF dla przeglądarek zgodnych Mozilla
 Group:		X11/Applications
 Prereq:		mozilla-embedded
 Requires:	%{base_name} = %{epoch}:%{version}
+Requires:	browser-plugins(%{_target_cpu})
+Obsoletes:	mozilla-plugin-acroread
 
-%description -n mozilla-plugin-%{base_name}
+%description plugin
 A Mozilla plugin for displaying PDF (Portable Document Format) files.
 
-%description -n mozilla-plugin-%{base_name} -l pl
+%description plugin -l pl
 Wtyczka Mozilli do wyświetlania plików PDF (Portable Document Format).
 
 %prep
@@ -101,7 +101,7 @@
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{base_name},%{mozdir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{base_name},%{_plugindir}} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 cd AdobeReader
@@ -110,7 +110,7 @@
 	'/^install_dir=/ {print "install_dir="INSTDIR; next} \
 	{print}' \
 	bin/%{base_name} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}
-install Browser/%{platform}/* $RPM_BUILD_ROOT%{mozdir}
+install Browser/%{platform}/* $RPM_BUILD_ROOT%{_plugindir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
@@ -127,6 +127,52 @@
 %if %{without license_agreement}
 %pre
 %{_bindir}/%{base_name}.install
+
+%else
+
+%triggerin -- mozilla-firefox
+%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins nppdf.so
+
+%triggerun -- mozilla-firefox
+%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins nppdf.so
+
+%triggerin -- mozilla
+%nsplugin_install -d %{_libdir}/mozilla/plugins nppdf.so
+if [ -d /usr/%{_lib}/mozilla ]; then
+	umask 022
+	rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat
+	if [ -x /usr/bin/regxpcom ]; then
+		MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom
+	fi
+fi
+
+%triggerun -- mozilla
+%nsplugin_uninstall -d %{_libdir}/mozilla/plugins nppdf.so
+if [ -d /usr/%{_lib}/mozilla ]; then
+	umask 022
+	rm -f /usr/%{_lib}/mozilla/components/{compreg,xpti}.dat
+	if [ -x /usr/bin/regxpcom ]; then
+		MOZILLA_FIVE_HOME=/usr/%{_lib}/mozilla /usr/bin/regxpcom
+	fi
+fi
+
+# % triggerin -- konqueror
+# % nsplugin_install -d %{_libdir}/kde3/plugins/konqueror nppdf.so
+
+# % triggerun -- konqueror
+# % nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror nppdf.so
+
+# % triggerin -- opera
+# % nsplugin_install -d %{_libdir}/opera/plugins nppdf.so
+
+# % triggerun -- opera
+# % nsplugin_uninstall -d %{_libdir}/opera/plugins nppdf.so
+
+# as rpm removes the old obsoleted package files after the triggers
+# above are ran, add another trigger to make the links there.
+%triggerpostun -- mozilla-plugin-acroread
+%nsplugin_install -f -d %{_libdir}/mozilla/plugins nppdf.so
+
 %endif
 
 %files
@@ -161,9 +207,9 @@
 %{_desktopdir}/acroread.desktop
 %{_pixmapsdir}/*
 
-%files -n mozilla-plugin-%{base_name}
+%files plugin
 %defattr(644,root,root,755)
-%attr(755,root,root) %{mozdir}/*
+%attr(755,root,root) %{_plugindir}/*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -172,6 +218,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2005/12/09 13:30:00  baggins
+- release 2.1
+- use browser-plugins framework
+
 Revision 1.46  2005/08/28 20:07:12  glen
 - use shared license-installer.sh from SOURCES
 - rel 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/acroread.spec?r1=1.46&r2=1.47&f=u