gloobus-preview: remove libre suffix and add complex pkgrel

8 files changed, 9 insertions, 11 deletions

diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview/PKGBUILD
index 8385ea8b1..7d02eb70e 100644
--- a/libre/gloobus-preview-libre/PKGBUILD
+++ b/libre/gloobus-preview/PKGBUILD
@@ -2,20 +2,18 @@
 # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=gloobus-preview
-pkgname=gloobus-preview-libre
+pkgname=gloobus-preview
 pkgver=0.4.5.290
 _pkgver=0.4.5-ubuntu11~ppa290
-pkgrel=2.1
+pkgrel=2.parabola1
 pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gloobus.net/"
 license=('GPL')
 depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gobject' 'gconf' 'taglib' 'xdg-utils')
 makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 optdepends=('djvulibre: Preview DjVu documents'
             'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-good-plugins: Extra media codecs'
@@ -26,8 +24,8 @@ optdepends=('djvulibre: Preview DjVu documents'
             'unoconv: Preview LibreOffice compatible documents'
             'libarchive: View content of RAR archives'
             'unzip: View content of .ZIP archives')
-install=$_pkgname.install
-source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
+install=$pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$pkgname/+files/${pkgname}_$_pkgver.orig.tar.xz
         gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
         fix-gtksource-include.patch
         fix-unoconv.patch
@@ -45,7 +43,7 @@ md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
          '25cda63ad406f00d3a7ba61ee8816b5c')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$_pkgver"
 
   # Python2 fix
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
@@ -78,7 +76,7 @@ prepare() {
 
 
 build() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$_pkgver"
 
   ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
                --disable-static
@@ -92,7 +90,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd "$srcdir/$pkgname-$_pkgver"
   make DESTDIR="$pkgdir" install
 
   ### Install gloobus-sushi
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview/fix-gtksource-include.patch
index 053169a43..053169a43 100644
--- a/libre/gloobus-preview-libre/fix-gtksource-include.patch
+++ b/libre/gloobus-preview/fix-gtksource-include.patch
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview/fix-unoconv.patch
index f918f3019..f918f3019 100644
--- a/libre/gloobus-preview-libre/fix-unoconv.patch
+++ b/libre/gloobus-preview/fix-unoconv.patch
diff --git a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch b/libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch
index 2c2540753..2c2540753 100644
--- a/libre/gloobus-preview-libre/gloobus-preview-configuration-pygobject3-port.patch
+++ b/libre/gloobus-preview/gloobus-preview-configuration-pygobject3-port.patch
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch
index 3db748114..3db748114 100644
--- a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
+++ b/libre/gloobus-preview/gloobus-preview-usr-bsdtar-for-rar.patch
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview/gloobus-preview.install
index 16ad7278f..16ad7278f 100644
--- a/libre/gloobus-preview-libre/gloobus-preview.install
+++ b/libre/gloobus-preview/gloobus-preview.install
diff --git a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch b/libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch
index f748da875..f748da875 100644
--- a/libre/gloobus-preview-libre/gloobus-sushi-pygobject3-port.patch
+++ b/libre/gloobus-preview/gloobus-sushi-pygobject3-port.patch
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview/use-xdg-open.patch
index 68e219e6a..68e219e6a 100644
--- a/libre/gloobus-preview-libre/use-xdg-open.patch
+++ b/libre/gloobus-preview/use-xdg-open.patch