[arch-commits] CVS update of extra/office/acroread (3 files)

Sun Sep 23 21:47:11 UTC 2007

Date: Sunday, September 23, 2007 @ 17:47:11
  Author: eric
    Path: /home/cvs-extra/extra/office/acroread

Modified: PKGBUILD (1.19 -> 1.20) acroread-scim.patch (1.1 -> 1.2)
 Removed: acroread-expr.patch (1.1)

upgpkg: acroread 8.1.1-1
upstream update, added license, PKGBUILD cleanup


---------------------+
 PKGBUILD            |   59 +++++++++++++++++++++++---------------------------
 acroread-expr.patch |   21 -----------------
 acroread-scim.patch |   18 +++++++--------
 3 files changed, 37 insertions(+), 61 deletions(-)


Index: extra/office/acroread/PKGBUILD
diff -u extra/office/acroread/PKGBUILD:1.19 extra/office/acroread/PKGBUILD:1.20

--- extra/office/acroread/PKGBUILD:1.19	Sat Mar  3 06:51:20 2007
+++ extra/office/acroread/PKGBUILD	Sun Sep 23 17:47:11 2007
@@ -1,47 +1,44 @@
-# $Id: PKGBUILD,v 1.19 2007/03/03 11:51:20 tpowa Exp $
+# $Id: PKGBUILD,v 1.20 2007/09/23 21:47:11 eric Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 
 pkgname=acroread
-pkgver=7.0.9
+pkgver=8.1.1
 pkgrel=1
 pkgdesc="Adobe Acrobat Reader for viewing PDF files"
+arch=('i686')
 url="http://www.adobe.com/products/acrobat/main.html"
-depends=(gtk2 bash mesa)
-makedepends=(rpmextract)
-source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/${pkgver}/enu/AdobeReader_enu-${pkgver}-1.i386.rpm
-	acroread-scim.patch
-	acroread-expr.patch)
-md5sums=('41bbf0cd3285b00f7799e9acef0d0f03' '79f546b719c613c71d6093950d9b5901'\
-         '2d25638bfc8501de70f92062e7573bc0')
+license=('custom')
+depends=('gtk2' 'bash' 'mesa')
+makedepends=('rpmextract')
+source=(http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${pkgver}/enu/AdobeReader_enu-${pkgver}-1.i486.rpm \
+	acroread-scim.patch)
+md5sums=('d5e8f5cebab675c657bf4f7b5a45638d' '8422bddbb8c03535704a245f9858465e')
 
 build() {
   cd ${startdir}/src
-  rpmextract.sh AdobeReader_enu-7.0.9-1.i386.rpm
-  cd usr/local/Adobe/Acrobat7.0
+  rpmextract.sh AdobeReader_enu-8.1.1-1.i486.rpm
+  cd opt/Adobe/Reader8
 
-  patch -Np1 -i ${startdir}/acroread-scim.patch || return 1
-  patch -Np1 -i ${startdir}/acroread-expr.patch || return 1
+  patch -Np3 -i ${startdir}/src/acroread-scim.patch || return 1
 
-  mkdir -p ${startdir}/pkg/usr/bin
-  mkdir -p ${startdir}/pkg/usr/share/applications
-  mkdir -p ${startdir}/pkg/usr/share/pixmaps
-  mkdir -p ${startdir}/pkg/opt/acrobat/bin
-  mkdir -p ${startdir}/pkg/opt/mozilla/lib/plugins
-  
-  install -m644 Resource/Support/AdobeReader_KDE.desktop \
+  install -D -m644 Resource/Support/AdobeReader.desktop \
+    ${startdir}/pkg/usr/share/applications/AdobeReader.desktop
+  sed -i 's/AdobeReader8.png/AdobeReader.png/' \
     ${startdir}/pkg/usr/share/applications/AdobeReader.desktop
-  install -m644 Resource/Icons/AdobeReader.png \
-    ${startdir}/pkg/usr/share/pixmaps
+  install -D -m644 Resource/Icons/64x64/AdobeReader8.png \
+    ${startdir}/pkg/usr/share/pixmaps/AdobeReader.png
   
-  chown -R --dereference -L root:0 Reader Resource
-  mv Reader ${startdir}/pkg/opt/acrobat/
-  mv Resource ${startdir}/pkg/opt/acrobat/
-
-  install -m755 bin/acroread ${startdir}/pkg/opt/acrobat/bin/
-  ln -sf ../../opt/acrobat/bin/acroread ${startdir}/pkg/usr/bin/acroread
+  install -d ${startdir}/pkg/opt/acrobat
+  cp -r Reader ${startdir}/pkg/opt/acrobat/
+  cp -r Resource ${startdir}/pkg/opt/acrobat/
+
+  install -D -m755 bin/acroread ${startdir}/pkg/opt/acrobat/bin/acroread
+  install -d ${startdir}/pkg/usr/bin
+  ln -sf /opt/acrobat/bin/acroread ${startdir}/pkg/usr/bin/acroread
 
-  install -m755 Browser/intellinux/nppdf.so \
-    ${startdir}/pkg/opt/mozilla/lib/plugins
+  install -D -m755 Browser/intellinux/nppdf.so \
+    ${startdir}/pkg/opt/mozilla/lib/plugins/nppdf.so
 
-  find ${startdir}/pkg -type d -exec chmod 755 {} \;
+  install -D -m644 Reader/Legal/en_US/License.txt \
+    ${startdir}/pkg/usr/share/licenses/${pkgname}/License.txt
 }
Index: extra/office/acroread/acroread-expr.patch
diff -u extra/office/acroread/acroread-expr.patch:1.1 extra/office/acroread/acroread-expr.patch:removed
--- extra/office/acroread/acroread-expr.patch:1.1	Sat Jul  8 12:32:58 2006
+++ extra/office/acroread/acroread-expr.patch	Sun Sep 23 17:47:11 2007
@@ -1,21 +0,0 @@
---- Acrobat7.0/bin/acroread.orig	2006-05-21 11:21:23.000000000 +0200
-+++ Acrobat7.0/bin/acroread	2006-05-21 11:30:06.000000000 +0200
-@@ -424,13 +424,13 @@
-             continue
-         fi
- 
--        len_version=`expr length $version`
--        base_version=`expr substr "${base_version}0000000000" 1 $len_version`
--        len_base_version=`expr length $base_version`
-+        len_version=`expr length "$version"`
-+        base_version=`expr substr "${base_version}0000000000" 1 "$len_version"`
-+        len_base_version=`expr length "$base_version"`
- 
-         while [ $len_version -gt $len_base_version ]; do
--            base_version=`expr substr "${base_version}0000000000" 1 $len_version`
--            len_base_version=`expr length $base_version`
-+            base_version=`expr substr "${base_version}0000000000" 1 "$len_version"`
-+            len_base_version=`expr length "$base_version"`
-         done
- 
-     	if [ $version -ge $base_version ]; then
Index: extra/office/acroread/acroread-scim.patch
diff -u extra/office/acroread/acroread-scim.patch:1.1 extra/office/acroread/acroread-scim.patch:1.2
--- extra/office/acroread/acroread-scim.patch:1.1	Sat Jul  8 12:32:58 2006
+++ extra/office/acroread/acroread-scim.patch	Sun Sep 23 17:47:11 2007
@@ -1,14 +1,14 @@
---- Acrobat7.0/bin/acroread	2005-05-18 09:05:35.000000000 +0200
-+++ Acrobat7.0/bin/acroread	2005-05-18 09:06:29.000000000 +0200
-@@ -255,6 +255,11 @@
- 	fi
- fi
+--- opt/Adobe/Reader8/bin/acroread.orig	2007-09-22 02:40:06.000000000 -0400
++++ opt/Adobe/Reader8/bin/acroread	2007-09-22 02:44:37.000000000 -0400
+@@ -528,6 +528,11 @@
+ mkdir -p "${HOME}/.adobe/Acrobat/$majorRelease/Preferences/mozilla"
+ cp -f "$ACRO_INSTALL_DIR/$ACRO_CONFIG/mozilla/prefs.js" "${HOME}/.adobe/Acrobat/$majorRelease/Preferences/mozilla/prefs.js"
  
 +if [ "$GTK_IM_MODULE" = "scim" ]; then
-+	GTK_IM_MODULE=xim
-+	export GTK_IM_MODULE
++       GTK_IM_MODULE=xim
++       export GTK_IM_MODULE
 +fi
 +
  if [ "$1" = "-DEBUG" ] ; then
-   if [ $# = 1 ] ; then
-     export ACRO_EXEC_CMD
+   ACRODEBUG=1
+   ACRO_CRASHLOG=1


