wings3d: remove libre suffix and add complex pkgrel

4 files changed, 16 insertions, 18 deletions

diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d/PKGBUILD
index 1a0380bd7..1690b4ba5 100644
--- a/libre/wings3d-libre/PKGBUILD
+++ b/libre/wings3d/PKGBUILD
@@ -3,11 +3,10 @@
 # Contributor (Arch): kappa <kappacurve@gmail.com>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-_pkgname=wings3d
 _name=wings
-pkgname=wings3d-libre
+pkgname=wings3d
 pkgver=1.5.3
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='3D modeling program, without nonfree kerkythea render support'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.wings3d.com/'
@@ -15,19 +14,18 @@ license=('GPL')
 depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
 makedepends=('gendesk')
 optdepends=('povray: rendering support via POV-Ray')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-install=$_pkgname.install
+conflicts=("${pkgname}-libre")
+replaces=("${pkgname}-libre")
+install=$pkgname.install
 source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
-        "$_pkgname.sh"
-        "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
+        "$pkgname.sh"
+        "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
 sha256sums=('c08060016f83679ce08947942d31af0e3b5d105525d0df5e993ec6f1a81fdd8e'
             '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
             '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
 
 prepare() {
-  gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \
+  gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \
     --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
 }
 
@@ -37,20 +35,20 @@ build() {
 }
 
 package() {
-  install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
   cd "$_name-$pkgver"
-  install -d "$pkgdir/usr/lib/$_pkgname"
+  install -d "$pkgdir/usr/lib/$pkgname"
   for subdir in ebin fonts patches plugins shaders textures; do
-    cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname"
+    cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname"
   done
   msg 'remove nonfree kerkythea render support plugin'
-  rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_kerky.beam
+  rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_kerky.beam
 
   msg 'remove deprecated yafray render support plugin'
-  rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
+  rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/wings3d-libre/wings3d.install b/libre/wings3d/wings3d.install
index ad97d7bab..ad97d7bab 100644
--- a/libre/wings3d-libre/wings3d.install
+++ b/libre/wings3d/wings3d.install
diff --git a/libre/wings3d-libre/wings3d.png b/libre/wings3d/wings3d.png
index 1fe6579dc..1fe6579dc 100644
--- a/libre/wings3d-libre/wings3d.png
+++ b/libre/wings3d/wings3d.png
diff --git a/libre/wings3d-libre/wings3d.sh b/libre/wings3d/wings3d.sh
index c0fd3b2fb..c0fd3b2fb 100644
--- a/libre/wings3d-libre/wings3d.sh
+++ b/libre/wings3d/wings3d.sh