[arch-commits] Commit in file-roller/trunk (PKGBUILD fr-rpm-bsdtar.patch)
Jan de Groot
jgc at archlinux.org
Thu Jan 15 12:40:11 UTC 2009
Date: Thursday, January 15, 2009 @ 07:40:11
Author: jgc
Revision: 24215
Update to GNOME 2.24.3
Use bsdtar instead of CPIO to unpack RPM archives (FS#12712)
Added:
file-roller/trunk/fr-rpm-bsdtar.patch
Modified:
file-roller/trunk/PKGBUILD
---------------------+
PKGBUILD | 16 ++++++++++------
fr-rpm-bsdtar.patch | 20 ++++++++++++++++++++
2 files changed, 30 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-01-15 12:32:50 UTC (rev 24214)
+++ PKGBUILD 2009-01-15 12:40:11 UTC (rev 24215)
@@ -2,25 +2,29 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=file-roller
-pkgver=2.24.2
-pkgrel=2
+pkgver=2.24.3
+pkgrel=1
pkgdesc="Archive manipulator for GNOME2"
arch=(i686 x86_64)
license=('GPL')
depends=('libgnomeui>=2.24.0' 'desktop-file-utils')
-makedepends=('perlxml' 'gnome-doc-utils>=0.14.0' 'pkgconfig' 'nautilus>=2.24.2')
+makedepends=('intltool' 'gnome-doc-utils>=0.14.2' 'pkgconfig' 'nautilus>=2.24.2')
+optdepends=('nautilus: nautilus shell extension')
groups=('gnome-extra')
options=('!libtool' '!emptydirs')
install=file-roller.install
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2
- fr-process-kill.patch)
-md5sums=('886c5201e8609aadd69798aa745ada4a'
- '9da94cd67fee551bec5290844a48d76e')
+ fr-process-kill.patch
+ fr-rpm-bsdtar.patch)
+md5sums=('20264b13cd27c6542c8289256d768c9c'
+ '9da94cd67fee551bec5290844a48d76e'
+ '918057080ef487c625f326ed5637f490')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np0 -i "${srcdir}/fr-process-kill.patch" || return 1
+ patch -Np0 -i "${srcdir}/fr-rpm-bsdtar.patch" || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/file-roller \
--localstatedir=/var --disable-static \
Added: fr-rpm-bsdtar.patch
===================================================================
--- fr-rpm-bsdtar.patch (rev 0)
+++ fr-rpm-bsdtar.patch 2009-01-15 12:40:11 UTC (rev 24215)
@@ -0,0 +1,20 @@
+--- src/fr-command-rpm.c.orig 2009-01-15 13:35:12.000000000 +0100
++++ src/fr-command-rpm.c 2009-01-15 13:38:17.000000000 +0100
+@@ -175,7 +175,7 @@
+
+ fr_process_begin_command (comm->process, "sh");
+ fr_process_add_arg (comm->process, "-c");
+- fr_process_add_arg_concat (comm->process, "rpm2cpio ", comm->e_filename, " | cpio -itv", NULL);
++ fr_process_add_arg_concat (comm->process, "rpm2cpio ", comm->e_filename, " | bsdtar -tvf -", NULL);
+ fr_process_end_command (comm->process);
+ fr_process_start (comm->process);
+ }
+@@ -200,7 +200,7 @@
+
+ cmd = g_string_new ("rpm2cpio ");
+ g_string_append (cmd, comm->e_filename);
+- g_string_append (cmd, " | cpio -idu ");
++ g_string_append (cmd, " | bsdtar -xf - ");
+ for (scan = file_list; scan; scan = scan->next) {
+ char *filename = g_shell_quote (scan->data);
+ g_string_append (cmd, filename);
More information about the arch-commits
mailing list