[arch-commits] Commit in mate-file-archiver/repos (12 files)
Martin Wimpress
flexiondotorg at nymeria.archlinux.org
Tue Jan 28 14:34:12 UTC 2014
Date: Tuesday, January 28, 2014 @ 15:34:12
Author: flexiondotorg
Revision: 104943
archrelease: copy trunk to community-i686, community-x86_64
Added:
mate-file-archiver/repos/community-i686/PKGBUILD
(from rev 104942, mate-file-archiver/trunk/PKGBUILD)
mate-file-archiver/repos/community-i686/fr-rpm-bsdtar.patch
(from rev 104942, mate-file-archiver/trunk/fr-rpm-bsdtar.patch)
mate-file-archiver/repos/community-i686/mate-file-archiver.install
(from rev 104942, mate-file-archiver/trunk/mate-file-archiver.install)
mate-file-archiver/repos/community-x86_64/PKGBUILD
(from rev 104942, mate-file-archiver/trunk/PKGBUILD)
mate-file-archiver/repos/community-x86_64/fr-rpm-bsdtar.patch
(from rev 104942, mate-file-archiver/trunk/fr-rpm-bsdtar.patch)
mate-file-archiver/repos/community-x86_64/mate-file-archiver.install
(from rev 104942, mate-file-archiver/trunk/mate-file-archiver.install)
Deleted:
mate-file-archiver/repos/community-i686/PKGBUILD
mate-file-archiver/repos/community-i686/fr-rpm-bsdtar.patch
mate-file-archiver/repos/community-i686/mate-file-archiver.install
mate-file-archiver/repos/community-x86_64/PKGBUILD
mate-file-archiver/repos/community-x86_64/fr-rpm-bsdtar.patch
mate-file-archiver/repos/community-x86_64/mate-file-archiver.install
---------------------------------------------+
/PKGBUILD | 96 ++++++++++++++++++++
/fr-rpm-bsdtar.patch | 120 ++++++++++++++++++++++++++
/mate-file-archiver.install | 26 +++++
community-i686/PKGBUILD | 51 -----------
community-i686/fr-rpm-bsdtar.patch | 60 -------------
community-i686/mate-file-archiver.install | 13 --
community-x86_64/PKGBUILD | 51 -----------
community-x86_64/fr-rpm-bsdtar.patch | 60 -------------
community-x86_64/mate-file-archiver.install | 13 --
9 files changed, 242 insertions(+), 248 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-01-28 14:34:00 UTC (rev 104942)
+++ community-i686/PKGBUILD 2014-01-28 14:34:12 UTC (rev 104943)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper at gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-# Contributor: Xpander <xpander0 at gmail.com>
-# Contributor: hekel <hekel(at)archlinux.info>
-
-pkgname=mate-file-archiver
-pkgver=1.6.0
-pkgrel=7
-pkgdesc="Archive manipulator for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive'
- 'mate-file-manager' 'tar')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-optdepends=('unrar: for RAR uncompression'
-'zip: for ZIP archives' 'unzip: for ZIP archives'
-'p7zip: 7zip compression utility' 'arj: for ARJ archives'
-'unace: extraction tool for the proprietary ace archive format')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
- fr-rpm-bsdtar.patch)
-sha1sums=('c7df115b532a14fb7be193113da32cda4a2218e8'
- '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${pkgname}.install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # This patch 'depends' on libarchive
- patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./autogen.sh \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgname} \
- --disable-static \
- --disable-scrollkeeper \
- --disable-packagekit
- mate-doc-prepare --force
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: mate-file-archiver/repos/community-i686/PKGBUILD (from rev 104942, mate-file-archiver/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-01-28 14:34:12 UTC (rev 104943)
@@ -0,0 +1,48 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=mate-file-archiver
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Archive manipulator for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive'
+ 'mate-file-manager' 'tar')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+optdepends=('arj: for ARJ support'
+ 'p7zip: for 7zip support'
+ 'unrar: for RAR extract support'
+ 'unace: for ACE extract support'
+ 'unzip: for ZIP extract support'
+ 'zip: for ZIP support')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
+ fr-rpm-bsdtar.patch)
+sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a'
+ '219b05a979bf6f249aaae27964f02345fd81168d')
+install=${pkgname}.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # This patch 'depends' on libarchive
+ patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgname} \
+ --disable-static \
+ --disable-scrollkeeper \
+ --disable-packagekit
+ mate-doc-prepare --force
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/fr-rpm-bsdtar.patch
===================================================================
--- community-i686/fr-rpm-bsdtar.patch 2014-01-28 14:34:00 UTC (rev 104942)
+++ community-i686/fr-rpm-bsdtar.patch 2014-01-28 14:34:12 UTC (rev 104943)
@@ -1,60 +0,0 @@
-This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
-It is useful on systems that do not have cpio or RPM/YUM
-This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
-
-------------------+
- rpm2cpio.c | 2 +-
- fr-command-rpm.c | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: src/commands/rpm2cpio.c
-================================
---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
-+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26
-@@ -128,7 +128,7 @@
- archive_command = "bzip2 -dc";
- fclose (stream);
-
-- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
-+ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
-
- return system (command);
- }
-Index: src/fr-command-rpm.c
-================================
---- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31
-+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26
-@@ -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, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
-+ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
- fr_process_end_command (comm->process);
- fr_process_start (comm->process);
- }
-@@ -200,7 +200,7 @@
-
- cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
- g_string_append (cmd, comm->e_filename);
-- g_string_append (cmd, " -idu ");
-+ g_string_append (cmd, " -xf - ");
- for (scan = file_list; scan; scan = scan->next) {
- char *filename = g_shell_quote (scan->data);
- g_string_append (cmd, filename);
-@@ -233,7 +233,7 @@
- FrCommandCap capabilities;
-
- capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
-- if (is_program_available ("cpio", check_command))
-+ if (is_program_available ("bsdtar", check_command))
- capabilities |= FR_COMMAND_CAN_READ;
-
- return capabilities;
-@@ -244,7 +244,7 @@
- fr_command_rpm_get_packages (FrCommand *comm,
- const char *mime_type)
- {
-- return PACKAGES ("cpio,rpm");
-+ return PACKAGES ("bsdtar,rpm");
- }
Copied: mate-file-archiver/repos/community-i686/fr-rpm-bsdtar.patch (from rev 104942, mate-file-archiver/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- community-i686/fr-rpm-bsdtar.patch (rev 0)
+++ community-i686/fr-rpm-bsdtar.patch 2014-01-28 14:34:12 UTC (rev 104943)
@@ -0,0 +1,60 @@
+This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
+It is useful on systems that do not have cpio or RPM/YUM
+This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
+
+------------------+
+ rpm2cpio.c | 2 +-
+ fr-command-rpm.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: src/commands/rpm2cpio.c
+================================
+--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26
+@@ -128,7 +128,7 @@
+ archive_command = "bzip2 -dc";
+ fclose (stream);
+
+- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
++ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
+
+ return system (command);
+ }
+Index: src/fr-command-rpm.c
+================================
+--- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31
++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26
+@@ -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, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
++ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
+ fr_process_end_command (comm->process);
+ fr_process_start (comm->process);
+ }
+@@ -200,7 +200,7 @@
+
+ cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
+ g_string_append (cmd, comm->e_filename);
+- g_string_append (cmd, " -idu ");
++ g_string_append (cmd, " -xf - ");
+ for (scan = file_list; scan; scan = scan->next) {
+ char *filename = g_shell_quote (scan->data);
+ g_string_append (cmd, filename);
+@@ -233,7 +233,7 @@
+ FrCommandCap capabilities;
+
+ capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
+- if (is_program_available ("cpio", check_command))
++ if (is_program_available ("bsdtar", check_command))
+ capabilities |= FR_COMMAND_CAN_READ;
+
+ return capabilities;
+@@ -244,7 +244,7 @@
+ fr_command_rpm_get_packages (FrCommand *comm,
+ const char *mime_type)
+ {
+- return PACKAGES ("cpio,rpm");
++ return PACKAGES ("bsdtar,rpm");
+ }
Deleted: community-i686/mate-file-archiver.install
===================================================================
--- community-i686/mate-file-archiver.install 2014-01-28 14:34:00 UTC (rev 104942)
+++ community-i686/mate-file-archiver.install 2014-01-28 14:34:12 UTC (rev 104943)
@@ -1,13 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mate-file-archiver/repos/community-i686/mate-file-archiver.install (from rev 104942, mate-file-archiver/trunk/mate-file-archiver.install)
===================================================================
--- community-i686/mate-file-archiver.install (rev 0)
+++ community-i686/mate-file-archiver.install 2014-01-28 14:34:12 UTC (rev 104943)
@@ -0,0 +1,13 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-01-28 14:34:00 UTC (rev 104942)
+++ community-x86_64/PKGBUILD 2014-01-28 14:34:12 UTC (rev 104943)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-# Contributor: Giovanni "Talorno" Ricciardi <kar98k.sniper at gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-# Contributor: Xpander <xpander0 at gmail.com>
-# Contributor: hekel <hekel(at)archlinux.info>
-
-pkgname=mate-file-archiver
-pkgver=1.6.0
-pkgrel=7
-pkgdesc="Archive manipulator for MATE"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive'
- 'mate-file-manager' 'tar')
-makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
-optdepends=('unrar: for RAR uncompression'
-'zip: for ZIP archives' 'unzip: for ZIP archives'
-'p7zip: 7zip compression utility' 'arj: for ARJ archives'
-'unace: extraction tool for the proprietary ace archive format')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
- fr-rpm-bsdtar.patch)
-sha1sums=('c7df115b532a14fb7be193113da32cda4a2218e8'
- '219b05a979bf6f249aaae27964f02345fd81168d')
-install=${pkgname}.install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # This patch 'depends' on libarchive
- patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./autogen.sh \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgname} \
- --disable-static \
- --disable-scrollkeeper \
- --disable-packagekit
- mate-doc-prepare --force
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: mate-file-archiver/repos/community-x86_64/PKGBUILD (from rev 104942, mate-file-archiver/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-01-28 14:34:12 UTC (rev 104943)
@@ -0,0 +1,48 @@
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=mate-file-archiver
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="Archive manipulator for MATE"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('bzip2' 'desktop-file-utils' 'gtk2' 'gzip' 'libarchive'
+ 'mate-file-manager' 'tar')
+makedepends=('mate-common' 'mate-doc-utils' 'perl-xml-parser')
+optdepends=('arj: for ARJ support'
+ 'p7zip: for 7zip support'
+ 'unrar: for RAR extract support'
+ 'unace: for ACE extract support'
+ 'unzip: for ZIP extract support'
+ 'zip: for ZIP support')
+options=('!emptydirs')
+groups=('mate-extra')
+source=("http://pub.mate-desktop.org/releases/1.6/${pkgname}-${pkgver}.tar.xz"
+ fr-rpm-bsdtar.patch)
+sha1sums=('53a28d6fb559151c0b8d6f9a658113c77cdb938a'
+ '219b05a979bf6f249aaae27964f02345fd81168d')
+install=${pkgname}.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # This patch 'depends' on libarchive
+ patch -Np1 -i "${srcdir}/fr-rpm-bsdtar.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgname} \
+ --disable-static \
+ --disable-scrollkeeper \
+ --disable-packagekit
+ mate-doc-prepare --force
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/fr-rpm-bsdtar.patch
===================================================================
--- community-x86_64/fr-rpm-bsdtar.patch 2014-01-28 14:34:00 UTC (rev 104942)
+++ community-x86_64/fr-rpm-bsdtar.patch 2014-01-28 14:34:12 UTC (rev 104943)
@@ -1,60 +0,0 @@
-This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
-It is useful on systems that do not have cpio or RPM/YUM
-This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
-
-------------------+
- rpm2cpio.c | 2 +-
- fr-command-rpm.c | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-Index: src/commands/rpm2cpio.c
-================================
---- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
-+++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26
-@@ -128,7 +128,7 @@
- archive_command = "bzip2 -dc";
- fclose (stream);
-
-- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
-+ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
-
- return system (command);
- }
-Index: src/fr-command-rpm.c
-================================
---- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31
-+++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26
-@@ -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, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
-+ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
- fr_process_end_command (comm->process);
- fr_process_start (comm->process);
- }
-@@ -200,7 +200,7 @@
-
- cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
- g_string_append (cmd, comm->e_filename);
-- g_string_append (cmd, " -idu ");
-+ g_string_append (cmd, " -xf - ");
- for (scan = file_list; scan; scan = scan->next) {
- char *filename = g_shell_quote (scan->data);
- g_string_append (cmd, filename);
-@@ -233,7 +233,7 @@
- FrCommandCap capabilities;
-
- capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
-- if (is_program_available ("cpio", check_command))
-+ if (is_program_available ("bsdtar", check_command))
- capabilities |= FR_COMMAND_CAN_READ;
-
- return capabilities;
-@@ -244,7 +244,7 @@
- fr_command_rpm_get_packages (FrCommand *comm,
- const char *mime_type)
- {
-- return PACKAGES ("cpio,rpm");
-+ return PACKAGES ("bsdtar,rpm");
- }
Copied: mate-file-archiver/repos/community-x86_64/fr-rpm-bsdtar.patch (from rev 104942, mate-file-archiver/trunk/fr-rpm-bsdtar.patch)
===================================================================
--- community-x86_64/fr-rpm-bsdtar.patch (rev 0)
+++ community-x86_64/fr-rpm-bsdtar.patch 2014-01-28 14:34:12 UTC (rev 104943)
@@ -0,0 +1,60 @@
+This makes Engrampa use bsdtar to extract .RPM packages instead of using cpio.
+It is useful on systems that do not have cpio or RPM/YUM
+This patch was created for Arch Linux, however should work on any system that has bsdtar capable of handling cpio archives.
+
+------------------+
+ rpm2cpio.c | 2 +-
+ fr-command-rpm.c | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+Index: src/commands/rpm2cpio.c
+================================
+--- mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-03-31
++++ mate-file-archiver-1.6.0/src/commands/rpm2cpio.c 2013-07-26
+@@ -128,7 +128,7 @@
+ archive_command = "bzip2 -dc";
+ fclose (stream);
+
+- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
++ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | bsdtar %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str);
+
+ return system (command);
+ }
+Index: src/fr-command-rpm.c
+================================
+--- mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-03-31
++++ mate-file-archiver-1.6.0/src/fr-command-rpm.c 2013-07-26
+@@ -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, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -itv", NULL);
++ fr_process_add_arg_concat (comm->process, PRIVEXECDIR "rpm2cpio ", comm->e_filename, " -tvf -", NULL);
+ fr_process_end_command (comm->process);
+ fr_process_start (comm->process);
+ }
+@@ -200,7 +200,7 @@
+
+ cmd = g_string_new (PRIVEXECDIR "rpm2cpio ");
+ g_string_append (cmd, comm->e_filename);
+- g_string_append (cmd, " -idu ");
++ g_string_append (cmd, " -xf - ");
+ for (scan = file_list; scan; scan = scan->next) {
+ char *filename = g_shell_quote (scan->data);
+ g_string_append (cmd, filename);
+@@ -233,7 +233,7 @@
+ FrCommandCap capabilities;
+
+ capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
+- if (is_program_available ("cpio", check_command))
++ if (is_program_available ("bsdtar", check_command))
+ capabilities |= FR_COMMAND_CAN_READ;
+
+ return capabilities;
+@@ -244,7 +244,7 @@
+ fr_command_rpm_get_packages (FrCommand *comm,
+ const char *mime_type)
+ {
+- return PACKAGES ("cpio,rpm");
++ return PACKAGES ("bsdtar,rpm");
+ }
Deleted: community-x86_64/mate-file-archiver.install
===================================================================
--- community-x86_64/mate-file-archiver.install 2014-01-28 14:34:00 UTC (rev 104942)
+++ community-x86_64/mate-file-archiver.install 2014-01-28 14:34:12 UTC (rev 104943)
@@ -1,13 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mate-file-archiver/repos/community-x86_64/mate-file-archiver.install (from rev 104942, mate-file-archiver/trunk/mate-file-archiver.install)
===================================================================
--- community-x86_64/mate-file-archiver.install (rev 0)
+++ community-x86_64/mate-file-archiver.install 2014-01-28 14:34:12 UTC (rev 104943)
@@ -0,0 +1,13 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list