iceweasel-l10n-18.0.1-5: fixing PKGBUILD.in

1 files changed, 16 insertions, 11 deletions

diff --git a/libre/iceweasel-l10n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in
index 16017fa61..5cbb7bbe0 100644
--- a/libre/iceweasel-l10n/PKGBUILD.in
+++ b/libre/iceweasel-l10n/PKGBUILD.in
@@ -1,6 +1,8 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -36,7 +38,7 @@ noextract=($(for lang in ${_langpacks[@]}
         do echo $lang.xpi
         done))
 
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+_path="/usr/lib/iceweasel/extensions"
         
 dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
@@ -50,16 +52,19 @@ build() {
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 
 cd $srcdir$_path
+  cd $srcdir/$_path
 
-for i in ${_langpacks[@]}
-do
+  for i in ${_langpacks[@]}
+  do
+    cd $srcdir/$_path
     unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
     rm langpack-$i@iceweasel.mozilla.org.xpi
     install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
-    zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i
-done
+    cd $i
+    zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi .
+  done
 
-cd $srcdir  
+  cd $srcdir
 }
 
 
@@ -69,11 +74,11 @@ cd $srcdir
 for lang in ${_langpacks[@]}
 do
     eval "
-package_iceweasel-l10n-$(echo $lang | tr A-Z a-z) () {
-  replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
-  install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
+package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
+  replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z))
+  install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
 }
 "
 done