Firefox 21 has a new directory for global extensions. Also, we do not extract the .xpi file any longer.

1 files changed, 13 insertions, 12 deletions

diff --git a/mozilla-firefox-l10n/build/mozilla-firefox-l10n.SlackBuild b/mozilla-firefox-l10n/build/mozilla-firefox-l10n.SlackBuild
index ccb9caf6..229b05b8 100755
--- a/mozilla-firefox-l10n/build/mozilla-firefox-l10n.SlackBuild
+++ b/mozilla-firefox-l10n/build/mozilla-firefox-l10n.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2012, 2013  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,10 +32,14 @@
 # Changelog:   
 # 15.0.1-1:    07/Sep/2012 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 21.0-1:      22/may/2013 by Eric Hameleers <alien@slackware.com>
+#              * Update required because since version 21, the global extensions
+#                are installed into a new directory. Also, it is not needed to
+#                extract the xpi file (thanks Tomek).
 # 
 # Run 'sh mozilla-firefox-l10n.SlackBuild' to build a Slackware package.
-# The package (.tgz) and .txt file as well as build logs are created in /tmp .
-# Install it using 'installpkg'. 
+# The package (.txz) and .txt file as well as build logs are created in /tmp .
+# Install it using 'upgradepkg --install-new'. 
 #
 # -----------------------------------------------------------------------------
 
@@ -44,7 +48,7 @@
 PKGLANG=${PKGLANG:-"nl"}
 
 PRGNAM=mozilla-firefox-l10n-$PKGLANG
-VERSION=${VERSION:-15.0.1}
+VERSION=${VERSION:-21.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -134,14 +138,11 @@ echo "|| $PRGNAM-$VERSION"
 echo "++"
 
 cd $TMP/tmp-$PRGNAM
-unzip ${SOURCE}
-chown -R root:root .
-chmod -R u+w,go+r-w,a+X-s .
 
 echo Building ...
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/firefox-$VERSION/extensions/langpack-${PKGLANG}@firefox.mozilla.org
-cp -a chrome chrome.manifest install.rdf \
-  $PKG/usr/lib$LIBDIRSUFFIX/firefox-$VERSION/extensions/langpack-${PKGLANG}@firefox.mozilla.org/
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/firefox-$VERSION/browser/extensions
+install -m 0644 ${SOURCE} \
+  $PKG/usr/lib$LIBDIRSUFFIX/firefox-$VERSION/browser/extensions/langpack-${PKGLANG}@firefox.mozilla.org.xpi
 
 # Tell the browser to switch its interface language to the OS language:
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/firefox-$VERSION/defaults/pref
@@ -185,9 +186,9 @@ cat $SRCDIR/slack-desc | sed -e "s/@PKGLANG@/$PKGLANG/g" > $PKG/install/slack-de
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt