ogre: remove libre suffix and add complex pkgrel

2 files changed, 8 insertions, 9 deletions

diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre/PKGBUILD
index 890b46163..99804ea63 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre/PKGBUILD
@@ -10,11 +10,11 @@ _addrel=1
 
 pkgbase=ogre
 pkgname=(
-  $pkgbase-libre
+  $pkgbase
   #$_bldname-addon-$pkgbase # package unstable
 )
 pkgver=1.9.0
-pkgrel=6
+pkgrel=6.parabola1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
 arch=(
   mips64el
@@ -132,14 +132,13 @@ build() {
   make
 }
 
-package_ogre-libre() {
+package_ogre() {
   optdepends=(
     "boost: for developing using $pkgbase"
     "$pkgbase-docs: documentation"
   )
-  provides=($pkgbase=$pkgver)
-  conflicts=$pkgbase
-  replaces=$pkgbase
+  conflicts=(${pkgbase}-libre)
+  replaces=(${pkgbase}-libre)
 
   cd ${pkgbase}/build
 
@@ -154,11 +153,11 @@ package_ogre-libre() {
 }
 
 package_blender-addon-ogre() {
-  pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)"
+  pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname package)"
   arch=any
   depends=(
-    "$_bldname-libre>=$(($_bldep-1)):$_bldver"
-    "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
+    "$_bldname>=$(($_bldep-1)):$_bldver"
+    "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
   _pkgver=$pkgver
   pkgver=$_addver.v$_bldver
diff --git a/libre/ogre-libre/libre.patch b/libre/ogre/libre.patch
index e9a1846b1..e9a1846b1 100644
--- a/libre/ogre-libre/libre.patch
+++ b/libre/ogre/libre.patch