texlive-core: remove libre suffix and add complex pkgrel

6 files changed, 22 insertions, 22 deletions

diff --git a/libre/texlive-core-libre/09-texlive-fonts.conf b/libre/texlive-core/09-texlive-fonts.conf
index f870fbd7a..f870fbd7a 100644
--- a/libre/texlive-core-libre/09-texlive-fonts.conf
+++ b/libre/texlive-core/09-texlive-fonts.conf
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core/PKGBUILD
index 419a384e7..9b4556602 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Michał Masłowski <mtjm@mtjm.eu>
 # Contributor: André Silva <emulatorman@parabola.nu>
 
-pkgname=texlive-core-libre
-_pkgname=texlive-core
+_pkgname=texlive-core-libre
+pkgname=texlive-core
 pkgver=2014.34872
 _revnr=${pkgver#2014.}
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
 license=('GPL')
 arch=(any)
@@ -23,14 +23,14 @@ optdepends=(
   't1utils:     can be useful when installing Type1 fonts'
 )
 groups=('texlive-most')
-conflicts=('tetex' 'texlive-latex3' 'texlive-core')
-provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver")
-replaces=('tetex' 'texlive-latex3' 'texlive-core')
+conflicts=('tetex' 'texlive-latex3' 'texlive-core-libre')
+provides=('tetex' 'texlive-latex3')
+replaces=('tetex' 'texlive-latex3' 'texlive-core-libre')
 url='http://tug.org/texlive/'
-mksource=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip")
-noextract=("$_pkgname-$pkgver-src.zip")
-source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-src.tar.xz"
-        "$_pkgname.maps"
+mksource=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+noextract=("$pkgname-$pkgver-src.zip")
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver-src.tar.xz"
+        "$pkgname.maps"
         "texmf.cnf"
         "texmfcnf.lua"
         "09-texlive-fonts.conf")
@@ -54,9 +54,9 @@ md5sums=('016626916175b074e98b6f1aa9fa9ff7'
          '393a4bf67adc7ca5df2b386759d1a637')
 
 mksource() {
-   mkdir $_pkgname-$pkgver
-   pushd $_pkgname-$pkgver
-   bsdtar xfv ../$_pkgname-$pkgver-src.zip
+   mkdir $pkgname-$pkgver
+   pushd $pkgname-$pkgver
+   bsdtar xfv ../$pkgname-$pkgver-src.zip
 
    # remove nonfree packages
    # MeX licensed packages.
@@ -72,7 +72,7 @@ mksource() {
 }
 
 build() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    echo -n "   --> extracting all packages... "
    for p in *.tar.xz; do 
      bsdtar -xf $p
@@ -88,11 +88,11 @@ build() {
    sed -i '/pltext.map/d'     texmf-dist/web2c/updmap.cfg 
 
    # remove nonfree packages references from texlive-core.maps
-   sed -i '/ccpl.map/d'       $srcdir/$_pkgname.maps
-   sed -i '/cs-charter.map/d' $srcdir/$_pkgname.maps
-   sed -i '/csfonts.map/d'    $srcdir/$_pkgname.maps
-   sed -i '/plother.map/d'    $srcdir/$_pkgname.maps
-   sed -i '/pltext.map/d'     $srcdir/$_pkgname.maps
+   sed -i '/ccpl.map/d'       $srcdir/$pkgname.maps
+   sed -i '/cs-charter.map/d' $srcdir/$pkgname.maps
+   sed -i '/csfonts.map/d'    $srcdir/$pkgname.maps
+   sed -i '/plother.map/d'    $srcdir/$pkgname.maps
+   sed -i '/pltext.map/d'     $srcdir/$pkgname.maps
 
    # remove nonfree packages references from fmtutil.cnf
    sed -i '/cslatex/d'     texmf-dist/web2c/fmtutil.cnf
@@ -102,12 +102,12 @@ build() {
 }
 
 package() {
-   cd $srcdir/$_pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
    # Install packages.
    install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs
    sed -i '/^#/d' CONTENTS
-   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${_pkgname}_${_revnr}.pkgs
-   install -m644 $srcdir/$_pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
+   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs
+   install -m644 $srcdir/$pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/
    install -m755 -d $pkgdir/usr/share
    wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
diff --git a/libre/texlive-core-libre/texlive-core.maps b/libre/texlive-core/texlive-core.maps
index 8cb9a9689..8cb9a9689 100644
--- a/libre/texlive-core-libre/texlive-core.maps
+++ b/libre/texlive-core/texlive-core.maps
diff --git a/libre/texlive-core-libre/texlive.install b/libre/texlive-core/texlive.install
index 77d4213be..77d4213be 100644
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core/texlive.install
diff --git a/libre/texlive-core-libre/texmf.cnf b/libre/texlive-core/texmf.cnf
index c96c20e39..c96c20e39 100644
--- a/libre/texlive-core-libre/texmf.cnf
+++ b/libre/texlive-core/texmf.cnf
diff --git a/libre/texlive-core-libre/texmfcnf.lua b/libre/texlive-core/texmfcnf.lua
index 4409692be..4409692be 100644
--- a/libre/texlive-core-libre/texmfcnf.lua
+++ b/libre/texlive-core/texmfcnf.lua