summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2005-03-29 10:20:26 +0000
committerMarinus Schraal <foser@gentoo.org>2005-03-29 10:20:26 +0000
commit7068fc80fa4ee5e6874c523fa149e1cf94d77b65 (patch)
treeadbc237c078ea1cdcd52d4fba8aa172fdc2cdc81 /app-arch/file-roller
parentVersion bump (diff)
downloadgentoo-2-7068fc80fa4ee5e6874c523fa149e1cf94d77b65.tar.gz
gentoo-2-7068fc80fa4ee5e6874c523fa149e1cf94d77b65.tar.bz2
gentoo-2-7068fc80fa4ee5e6874c523fa149e1cf94d77b65.zip
fix the rpm mix
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-arch/file-roller')
-rw-r--r--app-arch/file-roller/ChangeLog5
-rw-r--r--app-arch/file-roller/file-roller-2.10.0-r1.ebuild4
-rw-r--r--app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch30
3 files changed, 36 insertions, 3 deletions
diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index ae279ac00381..c18ec0d779bf 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-arch/file-roller
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.98 2005/03/20 02:18:48 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.99 2005/03/29 10:20:26 foser Exp $
+
+ 29 Mar 2005; foser <foser@gentoo.org> file-roller-2.10.0-r1.ebuild :
+ Update rpm patch so it actually works again
19 Mar 2005; Mike Doty <kingtaco@gentoo.org> file-roller-2.10.0-r1.ebuild,
file-roller-2.10.0.ebuild:
diff --git a/app-arch/file-roller/file-roller-2.10.0-r1.ebuild b/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
index c030f722b549..5390c674aeb5 100644
--- a/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
+++ b/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.0-r1.ebuild,v 1.3 2005/03/20 02:18:48 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.0-r1.ebuild,v 1.4 2005/03/29 10:20:26 foser Exp $
inherit gnome2 eutils
@@ -39,7 +39,7 @@ src_unpack() {
# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
epatch ${FILESDIR}/${PN}-2.8.0-use_bin_tar.patch
# use a local rpm2cpio script to avoid the dep
- epatch ${FILESDIR}/${PN}-2.6-use_fr_rpm2cpio.patch
+ epatch ${FILESDIR}/${PN}-2.10-use_fr_rpm2cpio.patch
#allow filenames with whitespaces
epatch ${FILESDIR}/${P}-fix_whitespace.patch
}
diff --git a/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch b/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch
new file mode 100644
index 000000000000..6b9ce2d521a6
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10-use_fr_rpm2cpio.patch
@@ -0,0 +1,30 @@
+diff -uNr file-roller-2.10.0/src/fr-command-rpm.c file-roller-2.10.0.patched/src/fr-command-rpm.c
+--- file-roller-2.10.0/src/fr-command-rpm.c 2005-03-07 13:29:37.000000000 +0100
++++ file-roller-2.10.0.patched/src/fr-command-rpm.c 2005-03-29 12:40:38.000000000 +0200
+@@ -131,7 +131,7 @@
+ list__process_line,
+ comm);
+
+- fr_process_begin_command (comm->process, "rpm2cpio");
++ fr_process_begin_command (comm->process, "rpm2cpio-file-roller");
+ fr_process_add_arg (comm->process, comm->e_filename);
+ fr_process_add_arg (comm->process, "| cpio --list --force-local --verbose");
+ fr_process_end_command (comm->process);
+@@ -150,7 +150,7 @@
+ {
+ GList *scan;
+
+- fr_process_begin_command (comm->process, "rpm2cpio");
++ fr_process_begin_command (comm->process, "rpm2cpio-file-roller");
+ if (dest_dir != NULL)
+ fr_process_set_working_dir (comm->process, dest_dir);
+ fr_process_add_arg (comm->process, comm->e_filename);
+@@ -240,7 +240,7 @@
+ {
+ FRCommand *comm;
+
+- if (!is_program_in_path("rpm2cpio")) {
++ if (!is_program_in_path("rpm2cpio-file-roller")) {
+ return NULL;
+ }
+