packages: acroread/acroread.spec - removed obsolete rm - package nppdf plug...

[qboosh]

Author: qboosh                       Date: Sun Apr 10 19:23:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed obsolete rm
- package nppdf plugin and acroread script in a way compatible with other Adobe
  software, like AIR (tested with AIR 2.6)
- rel 3

---- Files affected:
packages/acroread:
   acroread.spec (1.116 -> 1.117) 

---- Diffs:

================================================================
Index: packages/acroread/acroread.spec
diff -u packages/acroread/acroread.spec:1.116 packages/acroread/acroread.spec:1.117
--- packages/acroread/acroread.spec:1.116	Thu Mar 17 13:57:28 2011
+++ packages/acroread/acroread.spec	Sun Apr 10 21:23:23 2011
@@ -4,7 +4,7 @@
 %bcond_with	license_agreement	# generates package
 #
 %define		base_name	acroread
-%define		rel		2
+%define		rel		3
 Summary:	Adobe Acrobat Reader
 Summary(pl.UTF-8):	Adobe Acrobat Reader - czytnik plików PDF
 Summary(ru.UTF-8):	Программа для чтения документов в формате PDF от Adobe
@@ -119,28 +119,33 @@
 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 /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
 
@@ -169,15 +174,17 @@
 %{_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
@@ -198,12 +205,15 @@
 %{_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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -212,6 +222,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117  2011/04/10 19:23:23  qboosh
+- removed obsolete rm
+- package nppdf plugin and acroread script in a way compatible with other Adobe
+  software, like AIR (tested with AIR 2.6)
+- rel 3
+
 Revision 1.116  2011/03/17 12:57:28  evil
 - up to 9.4.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/acroread/acroread.spec?r1=1.116&r2=1.117&f=u