--- a/base-specs/acroread.spec	Fri Mar 14 16:19:07 2008 +0000
+++ b/base-specs/acroread.spec	Fri Mar 14 18:02:27 2008 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005 Sun Microsystems Inc.
+# Copyright (c) 2008 Sun Microsystems Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -9,7 +9,7 @@
 License:      Commercial
 Group:        Applications/Multimedia
 Provides:     acroread
-Version:      7.0.9
+Version:      8.1.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -20,42 +20,19 @@
 Autoreqprov:  no
 PreReq:       firefox
 
-%ifos solaris
-Source:       http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/AdbeRdr709_solaris_enu.tar.gz
-Source1:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/chs/AdobeReader_chs-7.0.5-1.i386.tar.gz
-Source2:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/cht/AdobeReader_cht-7.0.5-1.i386.tar.gz
-Source3:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/jpn/AdobeReader_jpn-7.0.5-1.i386.tar.gz
-Source4:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/kor/AdobeReader_kor-7.0.5-1.i386.tar.gz
+Source:       http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.1/enu/AdobeReader_enu-8.1.1-1.sparc.tar.gz
+Source1:      http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.1/jpn/AdobeReader_jpn-8.1.1-1.sparc.tar.gz
+Source2:      http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.1/chs/AdobeReader_chs-8.1.1-1.i486.tar.gz
+Source3:      http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.1/cht/AdobeReader_cht-8.1.1-1.i486.tar.gz
+Source4:      http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.1/kor/AdobeReader_kor-8.1.1-1.i486.tar.gz
 Source5:      l10n-configure.sh
 Source6:      acroread-combined-langs
-Source7:      libz.so.1-sparc-5.11.49.bz2
-%define acro_dir AdobeReader
-%define base_install_dir %{_libdir}/%{acro_dir}
-%define acrobin_dir %{_bindir}
-%define desktop_apps_dir %{_datadir}/applications
-%define hicolor_theme_dir %{_datadir}/icons/hicolor
+Source7:      acroread-reader_prefs
+
+%define adobe_base_dir %{_libdir}/AdobeReader
+%define adobe_doc_dir %{adobe_base_dir}/doc/acroread
 %define plugin_dir %{_libdir}/firefox/plugins
-%define acrodoc_dir %{base_install_dir}/doc/%{name}
-%define platform_acro_file SSOLR.TAR
-%define platform_browser_dir sparcsolaris
-%define plugin_link_target ../../%{acro_dir}/Browser/%{platform_browser_dir}/nppdf.so
-%else
-Source:       http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.8/enu/AdobeReader_enu-7.0.8-1.i386.tar.gz
-Source1:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/chs/AdobeReader_chs-7.0.5-1.i386.tar.gz
-Source2:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/cht/AdobeReader_cht-7.0.5-1.i386.tar.gz
-Source3:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/jpn/AdobeReader_jpn-7.0.5-1.i386.tar.gz
-Source4:      http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/kor/AdobeReader_kor-7.0.5-1.i386.tar.gz
-Source5:      l10n-configure.sh
-Source6:      acroread-combined-langs
-%define acro_dir AdobeReader
-%define base_install_dir %{_prefix}/X11R6/lib/%{acro_dir}
-%define acrobin_dir %{_prefix}/X11R6/bin
-%define plugin_dir %{_libdir}/firefox/plugins
-%define acrodoc_dir %{_defaultdocdir}/%{name}
-%define platform_acro_file ILINXR.TAR
-%define platform_browser_dir intellinux
-%define plugin_link_target %{base_install_dir}/Browser/%{platform_browser_dir}/nppdf.so
-%endif
+%define plugin_link_target ../../AdobeReader/Adobe/Reader8/Browser/sparcsolaris/nppdf.so
 
 
 %description
@@ -65,18 +42,18 @@
 %prep
 %setup -q -c -n %{name}-%{version}
 
+mkdir jpn
+cd jpn
+gunzip -c %SOURCE1 | tar xf -
+cd ..
+
 mkdir chs
 cd chs
-gunzip -c %SOURCE1 | tar xf -
+gunzip -c %SOURCE2 | tar xf -
 cd ..
 
 mkdir cht
 cd cht
-gunzip -c %SOURCE2 | tar xf -
-cd ..
-
-mkdir jpn
-cd jpn
 gunzip -c %SOURCE3 | tar xf -
 cd ..
 
@@ -90,63 +67,91 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d ${RPM_BUILD_ROOT}%{base_install_dir}
+install -d ${RPM_BUILD_ROOT}%{adobe_base_dir}
 
-# Extract Asian font software
+# From the Linux-only Asian releases (chs, cht, kor), extract the COMMON.TAR
+# files, (but not ILINXR.TAR).  This gives us the localized license files
+# and possibly some useful font, cmap and help files.  Files common to all
+# different tarballs will get overwritten by later commands.
+
 cd chs/AdobeReader
-cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
+cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf - )
 cd ../..
+
 cd cht/AdobeReader
-cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
+cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf - )
 cd ../..
+
+cd kor/AdobeReader
+cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf - )
+cd ../..
+
+# From the SPARC Solaris releases (jpn and enu), just extract all the files
+# (over-writting any common files as we go).
+
 cd jpn/AdobeReader
-cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
-cd ../..
-cd kor/AdobeReader
-cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
+cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf -)
+cat SSOLR.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf -)
 cd ../..
-cd AdobeReader
-cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
-cat %{platform_acro_file} | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
-cd ..
-# overwrite distributed script with new ver that supports all langs
-install --mode=0755 %SOURCE6 ${RPM_BUILD_ROOT}%{base_install_dir}/bin/acroread
 
 cd AdobeReader
-install -d ${RPM_BUILD_ROOT}%{acrodoc_dir}
-install --mode=0644 LICREAD.TXT ${RPM_BUILD_ROOT}%{acrodoc_dir}
-install --mode=0644 ReadMe.htm ${RPM_BUILD_ROOT}%{acrodoc_dir}
+cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf -)
+cat SSOLR.TAR | (cd ${RPM_BUILD_ROOT}%{adobe_base_dir}; tar xvf -)
+cd ..
+
+# overwrite distributed script with new ver that supports all langs
+install --mode=0755 %SOURCE6 ${RPM_BUILD_ROOT}%{adobe_base_dir}/Adobe/Reader8/bin/acroread
 
-# make a link to the executable acroread script from a $PATH directory (/usr/bin or /usr/X11R6/bin)
-install -d ${RPM_BUILD_ROOT}%{acrobin_dir}
-cd ${RPM_BUILD_ROOT}%{_libdir}/AdobeReader/bin
+cd AdobeReader
+install -d ${RPM_BUILD_ROOT}%{adobe_doc_dir}
+install --mode=0644 ${RPM_BUILD_ROOT}%{adobe_base_dir}/Adobe/Reader8/Reader/Legal/en_US/License.txt \
+	${RPM_BUILD_ROOT}%{adobe_doc_dir}
+install --mode=0644 ${RPM_BUILD_ROOT}%{adobe_base_dir}/Adobe/Reader8/Reader/help/ENU/ReadMe.htm \
+	${RPM_BUILD_ROOT}%{adobe_doc_dir}
+
+# make a link to the executable acroread script from /usr/bin
+install -d ${RPM_BUILD_ROOT}%{_bindir}
+cd ${RPM_BUILD_ROOT}%{_libdir}/AdobeReader/Adobe/Reader8/bin
 cd ${RPM_BUILD_ROOT}%{_prefix}/bin
-ln -s ../lib/AdobeReader/bin/acroread .
-%ifos solaris
+ln -s ../lib/AdobeReader/Adobe/Reader8/bin/acroread .
+
 # Make link in /usr/sfw/bin for backward compatability with prev acroread ver.
 install -d ${RPM_BUILD_ROOT}%{_prefix}/sfw/bin
 cd ${RPM_BUILD_ROOT}%{_prefix}/sfw/bin
-ln -s ../../lib/AdobeReader/bin/acroread .
-install -d ${RPM_BUILD_ROOT}%{desktop_apps_dir}
-cd ${RPM_BUILD_ROOT}%{desktop_apps_dir}
-ln -s ../../lib/AdobeReader/Resource/Support/AdobeReader_GNOME.desktop acroread.desktop
-install -d ${RPM_BUILD_ROOT}%{hicolor_theme_dir}
-cd ${RPM_BUILD_ROOT}%{hicolor_theme_dir}
-for f in `cd  ../../../lib/AdobeReader/Resource/Icons/; /bin/ls -d *x*`
+ln -s ../../lib/AdobeReader/Adobe/Reader8/bin/acroread .
+
+# Make a link for the .desktop file
+install -d ${RPM_BUILD_ROOT}%{_datadir}/applications
+cd ${RPM_BUILD_ROOT}%{_datadir}/applications
+ln -s ../../lib/AdobeReader/Adobe/Reader8/Resource/Support/AdobeReader.desktop acroread.desktop
+
+# Make links for the hicolor theme icons
+install -d ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor
+cd ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor
+for f in `cd  ../../../lib/AdobeReader/Adobe/Reader8/Resource/Icons/; /bin/ls -d *x*`
 do 
-  install -d ${RPM_BUILD_ROOT}%{hicolor_theme_dir}/$f/apps
-  ln -s ../../../../../lib/AdobeReader/Resource/Icons/$f/AdobeReader.png ./$f/apps
+  install -d ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/$f/apps
+  ln -s ../../../../../lib/AdobeReader/Adobe/Reader8/Resource/Icons/$f/AdobeReader8.png ./$f/apps
 done
-%endif
 
+# Make a link for the Firefox plugin
 install --mode=755 -d ${RPM_BUILD_ROOT}%{plugin_dir}
 ln -s %{plugin_link_target} ${RPM_BUILD_ROOT}%{plugin_dir}/nppdf.so
 
-# install a private copy of libz
-cp %SOURCE7 ${RPM_BUILD_ROOT}%{_libdir}/AdobeReader/Reader/sparcsolaris/lib/libz.so.1.bz2
-cd ${RPM_BUILD_ROOT}%{_libdir}/AdobeReader/Reader/sparcsolaris/lib
-bunzip2 libz.so.1.bz2
-chmod 0755 libz.so.1
+# Overwrite the default global preferences file.
+# New file turns off BeyondReader startup screen (which would fail
+# anyway as the libgtkembedmoz dir has not been defined)
+install --mode=0644 %SOURCE7 ${RPM_BUILD_ROOT}%{adobe_base_dir}/Adobe/Reader8/Reader/GlobalPrefs/reader_prefs
+
+
+# This is Yuk!  This and the %post (and %preun) scripts are needed
+# because we cannot handle paths with spaces in SVr4 pkgs
+cd ${RPM_BUILD_ROOT}%{adobe_base_dir}/Adobe/Help
+mv "en_US/Adobe Reader" en_US/Adobe_Reader
+mv "ja_JP/Adobe Reader" ja_JP/Adobe_Reader
+mv "ko_KR/Adobe Reader" ko_KR/Adobe_Reader
+mv "zh_TW/Adobe Reader" zh_TW/Adobe_Reader
+mv "zh_CN/Adobe Reader" zh_CN/Adobe_Reader
 
 
 %clean
@@ -155,12 +160,13 @@
 
 %files
 %defattr(-,root,root)
-%{base_install_dir}
-%{acrobin_dir}/acroread
+%{_bindir}/acroread
 %{plugin_dir}/nppdf.so
-%{acrodoc_dir}
+%{adobe_base_dir}
 
 %changelog
+* Fri Jan 18 2008 - [email protected]
+- Up-revved to 8.1.1 (private libz no longer needed)
 * Fri Apr 13 2007 - [email protected]
 - add a private copy of libz to acroread
 * Tue Feb 20 2007 - [email protected]