[arch-commits] Commit in file-roller/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 15:29:13
  Author: jgc
Revision: 54788

Merged revisions 54786 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/file-roller/trunk

........
  r54786 | jgc | 2009-10-11 21:28:29 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  file-roller/repos/extra-x86_64/	(properties)
  file-roller/repos/extra-x86_64/PKGBUILD
Deleted:
  file-roller/repos/extra-x86_64/fr-rpm-bsdtar.patch

---------------------+
 PKGBUILD            |   21 ++++++++-------------
 fr-rpm-bsdtar.patch |   20 --------------------
 2 files changed, 8 insertions(+), 33 deletions(-)


Property changes on: file-roller/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /file-roller/trunk:1-44771
   + /file-roller/trunk:1-54787

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-11 19:28:30 UTC (rev 54787)
+++ extra-x86_64/PKGBUILD	2009-10-11 19:29:13 UTC (rev 54788)
@@ -2,32 +2,27 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=file-roller
-pkgver=2.26.3
+pkgver=2.28.0
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('desktop-file-utils' 'gconf>=2.26.0-3') 
-makedepends=('intltool' 'gnome-doc-utils>=0.16.0' 'pkgconfig' 'nautilus>=2.26.3')
+depends=('desktop-file-utils' 'gconf>=2.28.0')
+makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'pkgconfig' 'nautilus>=2.28.0')
 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.26/${pkgname}-${pkgver}.tar.bz2
-	fr-rpm-bsdtar.patch)
-md5sums=('1876e9807a12c37f9bb2d00807905755'
-	 '918057080ef487c625f326ed5637f490')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('499fe835b297720f4e4054b4ab34a3fb619c3460c5da82b1519d9b86aa2f3ac2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/fr-rpm-bsdtar.patch" || return 1
-  rm -f src/fr-enum-types.c
-
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/file-roller \
-              --localstatedir=/var --disable-static \
-	      --disable-scrollkeeper || return 1
+      --libexecdir=/usr/lib/file-roller \
+      --localstatedir=/var --disable-static \
+      --disable-scrollkeeper || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 

Deleted: extra-x86_64/fr-rpm-bsdtar.patch
===================================================================
--- extra-x86_64/fr-rpm-bsdtar.patch	2009-10-11 19:28:30 UTC (rev 54787)
+++ extra-x86_64/fr-rpm-bsdtar.patch	2009-10-11 19:29:13 UTC (rev 54788)
@@ -1,20 +0,0 @@
---- 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);