summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-02 18:28:02 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-02 18:28:02 -0300
commit3d8c47975ad9e1cbca544af2410e66c5b63f6edf (patch)
tree591ce46cce35ff32e084fac08aa6a9d7563b42d2
parent83dab052f6036ac407ba1b9f123aae4abc2c29a2 (diff)
abiword: remove libre suffix and add complex pkgrel
-rw-r--r--libre/abiword/PKGBUILD (renamed from libre/abiword-libre/PKGBUILD)35
-rw-r--r--libre/abiword/abiword-2.8.6-glib-2.31.patch (renamed from libre/abiword-libre/abiword-2.8.6-glib-2.31.patch)0
-rw-r--r--libre/abiword/abiword-2.8.6-libpng15.patch (renamed from libre/abiword-libre/abiword-2.8.6-libpng15.patch)0
-rw-r--r--libre/abiword/abiword-2.8.6-no-undefined.patch (renamed from libre/abiword-libre/abiword-2.8.6-no-undefined.patch)0
-rw-r--r--libre/abiword/abiword-3.0.0-librevenge.patch (renamed from libre/abiword-libre/abiword-3.0.0-librevenge.patch)0
-rw-r--r--libre/abiword/abiword.install (renamed from libre/abiword-libre/abiword.install)0
-rw-r--r--libre/abiword/compat_libwpg_0_9.patch (renamed from libre/abiword-libre/compat_libwpg_0_9.patch)0
-rw-r--r--libre/abiword/fix_crash_saving_pdf.patch (renamed from libre/abiword-libre/fix_crash_saving_pdf.patch)0
-rw-r--r--libre/abiword/liberation-fonts.patch (renamed from libre/abiword-libre/liberation-fonts.patch)0
9 files changed, 16 insertions, 19 deletions
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword/PKGBUILD
index 4d48bf983..70eccc2ca 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword/PKGBUILD
@@ -3,11 +3,10 @@
# Contributor (Arch): Maël Lavault <moimael@neuf.fr>
# Maintainer: André Silva <emulatorman@parabola.nu>
-_pkgbase=abiword
-pkgbase=abiword-libre
-pkgname=('abiword-libre' 'abiword-libre-plugins')
+pkgbase=abiword
+pkgname=('abiword' 'abiword-plugins')
pkgver=3.0.0
-pkgrel=3
+pkgrel=3.parabola1
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url='http://www.abisource.com'
@@ -16,7 +15,7 @@ makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
'redland' 'libical')
options=('!makeflags')
-source=(http://abisource.com/downloads/$_pkgbase/$pkgver/source/$_pkgbase-$pkgver.tar.gz
+source=(http://abisource.com/downloads/$pkgbase/$pkgver/source/$pkgbase-$pkgver.tar.gz
fix_crash_saving_pdf.patch
abiword-3.0.0-librevenge.patch
liberation-fonts.patch)
@@ -26,7 +25,7 @@ md5sums=('8d9c41cff3a8fbef8d0c835c65600e65'
'e7ef4d436469ae4b24b0f784b09ab023')
prepare() {
- cd $_pkgbase-$pkgver
+ cd $pkgbase-$pkgver
# fix FS#39652 - http://bugzilla.abisource.com/show_bug.cgi?id=13586#c2
patch -Np2 -i ${srcdir}/fix_crash_saving_pdf.patch
@@ -47,7 +46,7 @@ prepare() {
build() {
- cd $_pkgbase-$pkgver
+ cd $pkgbase-$pkgver
# Collab plugin is somehow broken:
# part service
@@ -78,17 +77,16 @@ build() {
make
}
-package_abiword-libre() {
+package_abiword() {
pkgdesc='Fully-featured word processor, without nonfree fonts support'
depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
'redland' 'libical' 'gtk-update-icon-cache')
- install=$_pkgbase.install
- optdepends=('abiword-libre-plugins')
- conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
- replaces=('abiword')
- provides=("abiword=$pkgver")
+ install=$pkgbase.install
+ optdepends=('abiword-plugins')
+ conflicts=("abiword-plugins<${pkgver}-${pkgrel}" 'abiword-libre')
+ replaces=('abiword-libre')
- cd $_pkgbase-$pkgver
+ cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install
# split out plugins, there's no Makefile target for a clean way
@@ -96,13 +94,12 @@ package_abiword-libre() {
mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
}
-package_abiword-libre-plugins() {
+package_abiword-plugins() {
pkgdesc='Additional plugins for Abiword, without nonfree fonts support'
- depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
+ depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar'
'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
- conflicts=('abiword-plugins')
- replaces=('abiword-plugins')
- provides=("abiword-plugins=$pkgver")
+ conflicts=('abiword-libre-plugins')
+ replaces=('abiword-libre-plugins')
install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
diff --git a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch b/libre/abiword/abiword-2.8.6-glib-2.31.patch
index 8b938cc25..8b938cc25 100644
--- a/libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
+++ b/libre/abiword/abiword-2.8.6-glib-2.31.patch
diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword/abiword-2.8.6-libpng15.patch
index 7eded4c83..7eded4c83 100644
--- a/libre/abiword-libre/abiword-2.8.6-libpng15.patch
+++ b/libre/abiword/abiword-2.8.6-libpng15.patch
diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword/abiword-2.8.6-no-undefined.patch
index c07000edb..c07000edb 100644
--- a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch
+++ b/libre/abiword/abiword-2.8.6-no-undefined.patch
diff --git a/libre/abiword-libre/abiword-3.0.0-librevenge.patch b/libre/abiword/abiword-3.0.0-librevenge.patch
index 9ff7aea24..9ff7aea24 100644
--- a/libre/abiword-libre/abiword-3.0.0-librevenge.patch
+++ b/libre/abiword/abiword-3.0.0-librevenge.patch
diff --git a/libre/abiword-libre/abiword.install b/libre/abiword/abiword.install
index cc4abc0b6..cc4abc0b6 100644
--- a/libre/abiword-libre/abiword.install
+++ b/libre/abiword/abiword.install
diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword/compat_libwpg_0_9.patch
index cf36e188e..cf36e188e 100644
--- a/libre/abiword-libre/compat_libwpg_0_9.patch
+++ b/libre/abiword/compat_libwpg_0_9.patch
diff --git a/libre/abiword-libre/fix_crash_saving_pdf.patch b/libre/abiword/fix_crash_saving_pdf.patch
index 6dd78c7f9..6dd78c7f9 100644
--- a/libre/abiword-libre/fix_crash_saving_pdf.patch
+++ b/libre/abiword/fix_crash_saving_pdf.patch
diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword/liberation-fonts.patch
index 1660c3ead..1660c3ead 100644
--- a/libre/abiword-libre/liberation-fonts.patch
+++ b/libre/abiword/liberation-fonts.patch