8 files changed, 13 insertions, 8 deletions
diff --git a/libre/texlive-bin-libre/09-texlive-fonts.conf b/libre/texlive-bin-libre/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644..100755
--- a/libre/texlive-bin-libre/09-texlive-fonts.conf
+++ b/libre/texlive-bin-libre/09-texlive-fonts.conf
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 3dd2a8620..d5571465f 100644..100755
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162397 2012-06-26 20:13:46Z remy $
+# $Id: PKGBUILD 165207 2012-08-13 08:28:02Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2012.0
-pkgrel=2
+pkgrel=4
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -284,7 +284,6 @@ vpl2vpl
    _latexextra_scripts="
 authorindex
 exceltex
-exceltex
 makeglossaries
 pdfannotextractor
 perltex
diff --git a/libre/texlive-bin-libre/fix-fontforge-encoding.patch b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
index 8104b3289..8104b3289 100644..100755
--- a/libre/texlive-bin-libre/fix-fontforge-encoding.patch
+++ b/libre/texlive-bin-libre/fix-fontforge-encoding.patch
diff --git a/libre/texlive-bin-libre/luatex-poppler-0.20.patch b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
index 175824f3e..175824f3e 100644..100755
--- a/libre/texlive-bin-libre/luatex-poppler-0.20.patch
+++ b/libre/texlive-bin-libre/luatex-poppler-0.20.patch
diff --git a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
index f925a1a93..f925a1a93 100644..100755
--- a/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
+++ b/libre/texlive-bin-libre/luatex-r4449-radical-rule-thickness.patch
diff --git a/libre/texlive-bin-libre/poppler-0.20.patch b/libre/texlive-bin-libre/poppler-0.20.patch
index 3bd8183ab..3bd8183ab 100644..100755
--- a/libre/texlive-bin-libre/poppler-0.20.patch
+++ b/libre/texlive-bin-libre/poppler-0.20.patch
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index b85850123..06a40a3b3 100644..100755
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -16,13 +16,19 @@ post_install() {
 }
 
 post_upgrade() {
+  local corename corever _pacout
   echo    ">>> texlive: updating the filename database..."
   usr/bin/mktexlsr
-  echo -n   "recreating all formats..."
-  usr/bin/fmtutil-sys --all 1>/dev/null
-  echo      " done." 
-  echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
-
+  _pacout=$(pacman -Q texlive-core 2>/dev/null)
+  read corename corever <<< ${_pacout}
+  if [[ ${corever} == 2012* ]]; then
+      echo -n   "recreating all formats..."
+      usr/bin/fmtutil-sys --all 1>/dev/null
+      echo      " done." 
+      echo      " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+  else
+      echo "WARNING: not recreating formats since texlive-core has version '$corever'"
+  fi
   [[ -x usr/bin/install-info ]] || return 0
   for file in "${filelist[@]}"; do
     install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
diff --git a/libre/texlive-bin-libre/texmf.cnf b/libre/texlive-bin-libre/texmf.cnf
index 76975ee5c..76975ee5c 100644..100755
--- a/libre/texlive-bin-libre/texmf.cnf
+++ b/libre/texlive-bin-libre/texmf.cnf