X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acroread.spec;h=86632e3d3b36145b7774334d6fe66b0603ac559c;hb=0337a7fe7903808fa2f65f01925a8d314e397788;hp=6db082dcebdd8bc23fba63fd592a7c3c84d015e1;hpb=5acc59b23dfec3b9cf662e9eab0485f7bda7afc2;p=packages%2Facroread.git

diff --git a/acroread.spec b/acroread.spec
index 6db082d..86632e3 100644
--- a/acroread.spec
+++ b/acroread.spec
@@ -3,6 +3,7 @@
 %bcond_with	license_agreement	# generates package
 #
 %define		base_name	acroread
+%define		rel		2
 Summary:	Adobe Acrobat Reader
 Summary(pl.UTF-8):	Adobe Acrobat Reader - czytnik plików PDF
 Summary(ru.UTF-8):	Программа для чтения документов в формате PDF от Adobe
@@ -12,9 +13,8 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-%define	_rel	1
-Version:	7.0.9
-Release:	%{_rel}%{?with_license_agreement:wla}
+Version:	9.1.3
+Release:	%{rel}%{?with_license_agreement:wla}
 Epoch:		1
 License:	distribution restricted (http://www.adobe.com/products/acrobat/distribute.html)
 # in short:
@@ -22,39 +22,35 @@ License:	distribution restricted (http://www.adobe.com/products/acrobat/distribu
 # - distribution on CD requires signing Distribution Agreement (see URL above)
 Group:		X11/Applications/Graphics
 %if %{with license_agreement}
-Source0:	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/%{version}/enu/AdobeReader_enu-%{version}-1.i386.tar.gz
-# NoSource0-md5:	a8e79a1af58f90640cf9e7e1532a5745
+Source0:	ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/%{version}/enu/AdbeRdr%{version}-1_i486linux_enu.tar.bz2
+# NoSource0-md5:	fec3eed6dfc921a6dcc4deab400e207e
+NoSource:	0
 %else
-Source0:	license-installer.sh
+Source1:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source1-md5:	4fb1600353dd57fe088e0b12fb0ecac2
 %endif
-# please update @COPYSOURCES@ below if you add more Sources.
-Source1:	%{base_name}.desktop
-Source2:	%{base_name}.png
-Patch0:		%{base_name}-expr.patch
-Patch1:		%{base_name}-scim.patch
-Patch2:		%{base_name}-gtk.patch
+# please update @COPYSOURCES@ below if you add more Sources or Patches.
+Source2:	%{base_name}.desktop
+Source3:	%{base_name}.png
 URL:		http://www.adobe.com/products/acrobat/
 %if %{with license_agreement}
-BuildRequires:	rpmbuild(macros) >= 1.236
-Requires:	openldap-libs >= 2.3
+BuildRequires:	rpmbuild(macros) >= 1.357
+Requires:	openldap-libs < 2.5
+Requires:	openldap-libs >= 2.4
 %else
-Requires:	rpm-build-tools
+Requires:	rpm-build-tools >= 4.4.35
 %endif
 ExclusiveArch:	%{ix86}
+ExcludeArch:	i386
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_plugindir	%{_libdir}/browser-plugins
-
-# TODO: galeon and skipstone, konqueror, opera.
-# use macro, otherwise extra LF inserted along with the ifarch
-%define	browsers mozilla, mozilla-firefox, seamonkey
-
 %define		platform	intellinux
 %define		tar0		ILINXR.TAR
 %define		tar1		COMMON.TAR
 
 %define		_noautostrip	.*\.api
-%define		_noautoreq	'^lib.*\.so$' '^lib.*\(VERSION\)$'
+%define		_noautoprov	libcrypto\.so.* libssl\.so.* libcurl\.so.* libicu.* libstdc++\.so.* libgcc_s\.so.*
+%define		_noautoreq	%{_noautoprov} '^lib.*\.so$' '^lib.*\(VERSION\)$'
 
 %description
 Adobe(R) Reader(R) is free software that lets you view and print PDF
@@ -79,7 +75,7 @@ Summary:	PDF plugin for Mozilla compatible browsers
 Summary(pl.UTF-8):	Wtyczka PDF dla przeglądarek zgodnych Mozilla
 Group:		X11/Applications
 Requires:	%{base_name} = %{epoch}:%{version}-%{release}
-Requires:	browser-plugins(%{_target_base_arch})
+Requires:	browser-plugins >= 2.0
 Obsoletes:	acroread-plugin
 Obsoletes:	mozilla-plugin-acroread
 
@@ -95,9 +91,6 @@ Wtyczka Mozilli do wyświetlania plików PDF (Portable Document Format).
 cd AdobeReader
 tar xf %{tar0}
 tar xf %{tar1}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %endif
 
 %install
@@ -113,33 +106,33 @@ sed -e '
 	s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
 	s,@DATADIR@,%{_datadir}/%{base_name},g
 	s/@COPYSOURCES@/%{base_name}{.desktop,.png}/g
-' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+' %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
-install %{PATCH0} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
-install %{PATCH1} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
-install %{PATCH2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{base_name},%{_plugindir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{base_name},%{_browserpluginsdir}} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-cd AdobeReader
+# note: there're also AdobeReader/Adobe/Help{,Viewer}
+cd AdobeReader/Adobe/Reader9
 cp -a Reader Resource $RPM_BUILD_ROOT%{_libdir}/%{base_name}
 awk -v INSTDIR=%{_libdir}/%{base_name}/Reader \
 	'/^install_dir=/ {print "install_dir="INSTDIR; next} \
 	{print}' \
 	bin/%{base_name} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}
-install Browser/%{platform}/* $RPM_BUILD_ROOT%{_plugindir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install Browser/%{platform}/* $RPM_BUILD_ROOT%{_browserpluginsdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+
+cp -a Browser/HowTo $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/Patch
 
-ln -sf /usr/lib/liblber-2.3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/%{platform}/lib/liblber.so
-ln -sf /usr/lib/libldap-2.3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/%{platform}/lib/libldap.so
+ln -sf /usr/lib/liblber-2.4.so.2 $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/%{platform}/lib/liblber.so
+ln -sf /usr/lib/libldap-2.4.so.2 $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/%{platform}/lib/libldap.so
 ln -sf /usr/share/ssl/ca-bundle.crt $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/Cert/curl-ca-bundle.crt
 
 chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/%{platform}/lib/*.so.*
@@ -151,44 +144,16 @@ rm -rf $RPM_BUILD_ROOT
 %if %{without license_agreement}
 %post
 %{_bindir}/%{base_name}.install
+%endif
 
-%else
-
-%triggerin -n browser-plugin-%{name} -- mozilla-firefox
-%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins nppdf.so
-
-%triggerun -n browser-plugin-%{name} -- mozilla-firefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins nppdf.so
-
-%triggerin -n browser-plugin-%{name} -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins nppdf.so
-
-%triggerun -n browser-plugin-%{name} -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins nppdf.so
-
-%triggerin -n browser-plugin-%{name} -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins nppdf.so
-
-%triggerun -n browser-plugin-%{name} -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins nppdf.so
-
-# % triggerin -n browser-plugin-%{name} -- konqueror
-# % nsplugin_install -d %{_libdir}/kde3/plugins/konqueror nppdf.so
-
-# % triggerun -n browser-plugin-%{name} -- konqueror
-# % nsplugin_uninstall -d %{_libdir}/kde3/plugins/konqueror nppdf.so
-
-# % triggerin -n browser-plugin-%{name} -- opera
-# % nsplugin_install -d %{_libdir}/opera/plugins nppdf.so
-
-# % triggerun -n browser-plugin-%{name} -- 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 -n browser-plugin-%{name} -- mozilla-plugin-acroread, acroread-plugin
-%nsplugin_install -f -d %{_libdir}/mozilla/plugins nppdf.so
+%if %{with license_agreement}
+%post -n browser-plugin-%{name}
+%update_browser_plugins
 
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
 %endif
 
 %files
@@ -197,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/%{base_name}.install
 %{_datadir}/%{base_name}
 %else
-%doc AdobeReader/{LICREAD.TXT,ReadMe.htm}
+%doc AdobeReader/ReadMe.htm
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{base_name}
 %{_libdir}/%{base_name}/Resource
@@ -207,25 +172,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{base_name}/Reader/Cert
 %{_libdir}/%{base_name}/Reader/GlobalPrefs
 %{_libdir}/%{base_name}/Reader/HowTo
-%{_libdir}/%{base_name}/Reader/Legal
+%{_libdir}/%{base_name}/Reader/IDTemplates
 %{_libdir}/%{base_name}/Reader/JavaScripts
-%{_libdir}/%{base_name}/Reader/Messages
-%{_libdir}/%{base_name}/Reader/WebSearch
+%{_libdir}/%{base_name}/Reader/Legal
+%{_libdir}/%{base_name}/Reader/Tracker
+%{_libdir}/%{base_name}/Reader/PDFSigQFormalRep.pdf
+%{_libdir}/%{base_name}/Reader/pmd.cer
+%{_libdir}/%{base_name}/Reader/%{platform}/mozilla
 %dir %{_libdir}/%{base_name}/Reader/%{platform}
 %dir %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins
+%dir %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/Multimedia
 %dir %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins3d
 %attr(755,root,root) %{_libdir}/%{base_name}/Reader/%{platform}/SPPlugins
 %attr(755,root,root) %{_libdir}/%{base_name}/Reader/%{platform}/bin
 %attr(755,root,root) %{_libdir}/%{base_name}/Reader/%{platform}/lib
 %attr(755,root,root) %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/*.api
 %attr(755,root,root) %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins3d/*.x3d
+%attr(755,root,root) %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/Multimedia/MPP
 %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/AcroForm
 %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/Annotations
-%{_libdir}/%{base_name}/Reader/%{platform}/res
+%{_libdir}/%{base_name}/Reader/%{platform}/plug_ins3d/prc
 %{_desktopdir}/acroread.desktop
 %{_pixmapsdir}/*
 
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_plugindir}/*
+%attr(755,root,root) %{_browserpluginsdir}/*
 %endif