--- a/ChangeLog	Tue Jul 04 16:43:28 2006 +0000
+++ b/ChangeLog	Tue Jul 04 17:04:56 2006 +0000
@@ -1,3 +1,7 @@
+2006-07-04  Dermot McCluskey - <[email protected]>
+
+	* acroread.spec: up-revved to 7.0.8
+
 2006-07-04  Laszlo (Laca) Peter  <[email protected]>
 
 	* GConf.spec: add patch gconftool-makefile-install.diff

--- a/acroread.spec	Tue Jul 04 16:43:28 2006 +0000
+++ b/acroread.spec	Tue Jul 04 17:04:56 2006 +0000
@@ -8,7 +8,7 @@
 License:      Commercial
 Group:        Applications/Multimedia
 Provides:     acroread
-Version:      7.0.1
+Version:      7.0.8
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -20,12 +20,13 @@
 PreReq:       firefox
 
 %ifos solaris
-Source:       http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_solaris_enu.tar.gz
-Source1:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/chs/AdbeRdr701_linux_chs.tar.gz
-Source2:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/cht/AdbeRdr701_linux_cht.tar.gz
-Source3:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/jpn/AdbeRdr701_linux_jpn.tar.gz
-Source4:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/kor/AdbeRdr701_linux_kor.tar.gz
+Source:       http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.8/enu/AdbeRdr708_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
 Source5:      l10n-configure.sh
+Source6:      acroread-combined-langs
 %define acro_dir AdobeReader
 %define base_install_dir %{_libdir}/%{acro_dir}
 %define acrobin_dir %{_bindir}
@@ -35,12 +36,13 @@
 %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/enu/AdbeRdr701_linux_enu.tar.gz
-Source1:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/chs/AdbeRdr701_linux_chs.tar.gz
-Source2:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/cht/AdbeRdr701_linux_cht.tar.gz
-Source3:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/jpn/AdbeRdr701_linux_jpn.tar.gz
-Source4:      ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0/kor/AdbeRdr701_linux_kor.tar.gz
+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
@@ -50,7 +52,6 @@
 %define platform_browser_dir intellinux
 %define plugin_link_target %{base_install_dir}/Browser/%{platform_browser_dir}/nppdf.so
 %endif
-Patch1:  acroread-01-lang.diff
 
 
 %description
@@ -87,9 +88,6 @@
 rm -rf $RPM_BUILD_ROOT
 install -d ${RPM_BUILD_ROOT}%{base_install_dir}
 
-
-# Extract the base-locale tarballs first as some files (bin/acroread) need to
-# be overwritten by the i18n versions from the Asian font tarballs later
 # Extract Asian font software
 cd chs/AdobeReader
 cat COMMON.TAR | (cd ${RPM_BUILD_ROOT}%{base_install_dir}; tar xvf -)
@@ -107,20 +105,17 @@
 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 ${RPM_BUILD_ROOT}%{acrodoc_dir}
-
-# hack to fix problem with corrupted filename
-mv ${RPM_BUILD_ROOT}%{base_install_dir}/Resource/Icons/AdobeReader.png?? \
-	${RPM_BUILD_ROOT}%{base_install_dir}/Resource/Icons/AdobeReader.png
+install --mode=0644 ReadMe.htm ${RPM_BUILD_ROOT}%{acrodoc_dir}
 
 # 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
-%patch1 -p0
 cd ${RPM_BUILD_ROOT}%{_prefix}/bin
 ln -s ../lib/AdobeReader/bin/acroread .
 %ifos solaris
@@ -146,6 +141,10 @@
 %{acrodoc_dir}
 
 %changelog
+* Tue Jul 04 2006 - [email protected]
+- Up-revved to 7.0.8 and overwrite provided acroread script with version
+  that supports the Asian LANGs
+
 * Wed May 10 2006 - [email protected]
 - change the plugin dir to /usr/lib/firefox/plugins since firefox move
   from /usr/sfw/lib to /usr/lib