X-Git-Url: http://git.pld-linux.org/?p=packages%2Facroread.git;a=blobdiff_plain;f=acroread.spec;h=3a45dce7ad2a829710f2074218980a7582cf371b;hp=1c40c523278278bf93dda3bfecef9e046a78d231;hb=HEAD;hpb=f6aff24b91dfde2f7c49320f492126af01567d42

diff --git a/acroread.spec b/acroread.spec
index 1c40c52..3a45dce 100644
--- a/acroread.spec
+++ b/acroread.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	license_agreement	# generates package
+%bcond_with	license_agreement	# generates package
 #
 %define		base_name	acroread
 %define		rel		1
@@ -13,7 +13,7 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	9.3.4
+Version:	9.5.5
 Release:	%{rel}%{?with_license_agreement:wla}
 Epoch:		1
 License:	distribution restricted (http://www.adobe.com/products/acrobat/distribute.html)
@@ -23,11 +23,11 @@ License:	distribution restricted (http://www.adobe.com/products/acrobat/distribu
 Group:		X11/Applications/Graphics
 %if %{with license_agreement}
 Source0:	ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/%{version}/enu/AdbeRdr%{version}-1_i486linux_enu.tar.bz2
-# NoSource0-md5:	fc5acf558e2817f2c633a075a398b26b
+# NoSource0-md5:	664d546fbf0ad91f20dcf3753b0a2684
 NoSource:	0
 %else
 Source1:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
-# Source1-md5:	e84250aa2fef6cdbf8f0890516eef43d
+# Source1-md5:	329c25f457fea66ec502b7ef70cb9ede
 %endif
 # please update @COPYSOURCES@ below if you add more Sources or Patches.
 Source2:	%{base_name}.desktop
@@ -35,6 +35,9 @@ Source3:	%{base_name}.png
 URL:		http://www.adobe.com/products/acrobat/
 %if %{with license_agreement}
 BuildRequires:	rpmbuild(macros) >= 1.357
+# to force 32bit iconv
+Requires:	%{_libdir}/gconv
+Requires:	ca-certificates >= 20080809-4
 Requires:	iconv
 Requires:	openldap-libs < 2.5
 Requires:	openldap-libs >= 2.4
@@ -52,7 +55,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautostrip	.*\.api
 %define		_noautoprov	libcrypto\.so.* libssl\.so.* libcurl\.so.* libicu.* libstdc++\.so.* libgcc_s\.so.*
+%if "%{_rpmversion}" >= "5.0"
+%define		_noautoreq	%{_noautoprov} '^lib.*\.so$' '^lib.*\\(VERSION\\)$'
+%else
 %define		_noautoreq	%{_noautoprov} '^lib.*\.so$' '^lib.*\(VERSION\)$'
+%endif
+%define         no_install_post_check_so        1
 
 %description
 Adobe(R) Reader(R) is free software that lets you view and print PDF
@@ -115,28 +123,33 @@ install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{base_name},%{_browserpluginsdir}} \
-	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{base_name}/bin} \
+	$RPM_BUILD_ROOT{%{_browserpluginsdir},%{_desktopdir},%{_pixmapsdir}}
 
-# note: there're also AdobeReader/Adobe/Help{,Viewer}
 cd AdobeReader/Adobe/Reader9
-cp -a Reader Resource $RPM_BUILD_ROOT%{_libdir}/%{base_name}
+cp -a Browser Reader Resource $RPM_BUILD_ROOT%{_libdir}/%{base_name}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Browser/install_browser_plugin
 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%{_browserpluginsdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+	bin/%{base_name} > $RPM_BUILD_ROOT%{_libdir}/%{base_name}/bin/%{base_name}
 
-cp -a Browser/HowTo $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/
+# IMPORTANT NOTE: Here symlinks must be used instead of moving parts of tree
+# for compatibility with other binary-only Adobe software (like AIR).
+# This one is required to find Reader tree (relative to symlink target)...
+ln -sf %{_libdir}/%{base_name}/bin/%{base_name} $RPM_BUILD_ROOT%{_bindir}/%{base_name}
+# ...and nppdf plugin is expected in Browser subdir...
+# ...so just symlink it to be used as browsers plugin.
+ln -sf %{_libdir}/%{base_name}/Browser/%{platform}/nppdf.so $RPM_BUILD_ROOT%{_browserpluginsdir}/nppdf.so
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/Patch
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 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
+ln -sf /etc/certs/ca-certificates.crt $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/Cert/curl-ca-bundle.crt
 
+# don't generate dependencies for internal libs
 chmod a-x $RPM_BUILD_ROOT%{_libdir}/%{base_name}/Reader/%{platform}/lib/*.so.*
 %endif
 
@@ -165,15 +178,17 @@ fi
 %{_datadir}/%{base_name}
 %else
 %doc AdobeReader/ReadMe.htm
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/acroread
 %dir %{_libdir}/%{base_name}
-%{_libdir}/%{base_name}/Resource
+%dir %{_libdir}/%{base_name}/Browser
+%dir %{_libdir}/%{base_name}/Browser/%{platform}
+%attr(755,root,root) %{_libdir}/%{base_name}/Browser/%{platform}/nppdf.so
+%{_libdir}/%{base_name}/Browser/HowTo
 %dir %{_libdir}/%{base_name}/Reader
 %{_libdir}/%{base_name}/Reader/help
 %{_libdir}/%{base_name}/Reader/AcroVersion
 %{_libdir}/%{base_name}/Reader/Cert
 %{_libdir}/%{base_name}/Reader/GlobalPrefs
-%{_libdir}/%{base_name}/Reader/HowTo
 %{_libdir}/%{base_name}/Reader/IDTemplates
 %{_libdir}/%{base_name}/Reader/JavaScripts
 %{_libdir}/%{base_name}/Reader/Legal
@@ -194,10 +209,13 @@ fi
 %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/AcroForm
 %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins/Annotations
 %{_libdir}/%{base_name}/Reader/%{platform}/plug_ins3d/prc
+%{_libdir}/%{base_name}/Resource
+%dir %{_libdir}/%{base_name}/bin
+%attr(755,root,root) %{_libdir}/%{base_name}/bin/acroread
 %{_desktopdir}/acroread.desktop
-%{_pixmapsdir}/*
+%{_pixmapsdir}/acroread.png
 
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_browserpluginsdir}/*
+%attr(755,root,root) %{_browserpluginsdir}/nppdf.so
 %endif