From 4ac32d4cf06625e145fe9b35d65c793192275d09 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 20:50:20 -0300 Subject: spacefm: remove libre suffix and add complex pkgrel --- libre/spacefm-libre/PKGBUILD | 50 ------------------------------------- libre/spacefm-libre/libre.patch | 24 ------------------ libre/spacefm-libre/spacefm.install | 14 ----------- libre/spacefm/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++ libre/spacefm/libre.patch | 24 ++++++++++++++++++ libre/spacefm/spacefm.install | 14 +++++++++++ 6 files changed, 86 insertions(+), 88 deletions(-) delete mode 100644 libre/spacefm-libre/PKGBUILD delete mode 100644 libre/spacefm-libre/libre.patch delete mode 100644 libre/spacefm-libre/spacefm.install create mode 100644 libre/spacefm/PKGBUILD create mode 100644 libre/spacefm/libre.patch create mode 100644 libre/spacefm/spacefm.install diff --git a/libre/spacefm-libre/PKGBUILD b/libre/spacefm-libre/PKGBUILD deleted file mode 100644 index 59c79f1c8..000000000 --- a/libre/spacefm-libre/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 116546 2014-07-29 18:12:51Z bpiotrowski $ -# Maintainer (Arch): Bartłomiej Piotrowski -# Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ -# Contributor (Arch): ridikulus_rat -# Maintainer: André Silva -# Contributor: Edison Ibañez - -_pkgname=spacefm -pkgname=spacefm-libre -pkgver=0.9.4 -pkgrel=2 -pkgdesc='Multi-panel tabbed file manager, with unar support' -arch=('i686' 'x86_64' 'mips64el') -url='http://ignorantguru.github.com/spacefm/' -license=('GPL3') -install=$_pkgname.install -depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' - 'systemd' 'bash' 'unar') -makedepends=('intltool' 'gettext') -optdepends=('lsof: device processes' - 'wget: plugin download' - 'gksu: perform as root functionality' - 'udevil: mount as non-root user and mount networks' - 'udisks: mount as non-root user' - 'udisks2: mount as non-root user') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz - libre.patch) -md5sums=('daeee7dcccea33d6258a0a9d783470c4' - '30ba2b4b8f5ae7bf1552689b192eab89') - -prepare() { - # replace nonfree unrar with unar support - cd $_pkgname-$pkgver - patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c -} - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --disable-pixmaps - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/libre/spacefm-libre/libre.patch b/libre/spacefm-libre/libre.patch deleted file mode 100644 index 82d51f705..000000000 --- a/libre/spacefm-libre/libre.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 -From: Edison Ibañez -Date: mar, 20 may 2014 10:27:55 -0500 -Subject: [PATCH] replace nonfree unrar with unar support - - -diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c -index ec9fbd7..55648d2 100644 ---- a/src/ptk/ptk-file-archiver.c -+++ b/src/ptk/ptk-file-archiver.c -@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= - { - "application/x-rar", - "rar a -r %o", -- "unrar -o- x", -- "unrar lt", -+ "unar -D ", -+ "unar -D ", - ".rar", "arc_rar", TRUE - }, - { --- -Gitg - diff --git a/libre/spacefm-libre/spacefm.install b/libre/spacefm-libre/spacefm.install deleted file mode 100644 index 76a5d56b9..000000000 --- a/libre/spacefm-libre/spacefm.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-mime-database /usr/share/mime > /dev/null - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD new file mode 100644 index 000000000..5159a11b0 --- /dev/null +++ b/libre/spacefm/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 116546 2014-07-29 18:12:51Z bpiotrowski $ +# Maintainer (Arch): Bartłomiej Piotrowski +# Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ +# Contributor (Arch): ridikulus_rat +# Maintainer: André Silva +# Contributor: Edison Ibañez + +pkgname=spacefm +pkgver=0.9.4 +pkgrel=2.parabola1 +pkgdesc='Multi-panel tabbed file manager, with unar support' +arch=('i686' 'x86_64' 'mips64el') +url='http://ignorantguru.github.com/spacefm/' +license=('GPL3') +install=$pkgname.install +depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' + 'systemd' 'bash' 'unar') +makedepends=('intltool' 'gettext') +optdepends=('lsof: device processes' + 'wget: plugin download' + 'gksu: perform as root functionality' + 'udevil: mount as non-root user and mount networks' + 'udisks: mount as non-root user' + 'udisks2: mount as non-root user') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz + libre.patch) +md5sums=('daeee7dcccea33d6258a0a9d783470c4' + '30ba2b4b8f5ae7bf1552689b192eab89') + +prepare() { + # replace nonfree unrar with unar support + cd $pkgname-$pkgver + patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-pixmaps + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/libre/spacefm/libre.patch b/libre/spacefm/libre.patch new file mode 100644 index 000000000..82d51f705 --- /dev/null +++ b/libre/spacefm/libre.patch @@ -0,0 +1,24 @@ +From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 +From: Edison Ibañez +Date: mar, 20 may 2014 10:27:55 -0500 +Subject: [PATCH] replace nonfree unrar with unar support + + +diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c +index ec9fbd7..55648d2 100644 +--- a/src/ptk/ptk-file-archiver.c ++++ b/src/ptk/ptk-file-archiver.c +@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= + { + "application/x-rar", + "rar a -r %o", +- "unrar -o- x", +- "unrar lt", ++ "unar -D ", ++ "unar -D ", + ".rar", "arc_rar", TRUE + }, + { +-- +Gitg + diff --git a/libre/spacefm/spacefm.install b/libre/spacefm/spacefm.install new file mode 100644 index 000000000..76a5d56b9 --- /dev/null +++ b/libre/spacefm/spacefm.install @@ -0,0 +1,14 @@ +post_install() { + update-mime-database /usr/share/mime > /dev/null + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3