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

[Jan de Groot]

    Date: Wednesday, January 7, 2009 @ 18:52:14
  Author: jgc
Revision: 23361

Merged revisions 23360 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/rpmextract/trunk

........
  r23360 | jgc | 2009-01-07 23:52:03 +0000 (Wed, 07 Jan 2009) | 2 lines
  
  upgpkg: rpmextract 1.0-2
      gunzip the output of rpm2cpio, file-roller cannot handle compressed cpio archives and hangs up completely
........

Modified:
  rpmextract/repos/extra-i686/	(properties)
  rpmextract/repos/extra-i686/PKGBUILD
  rpmextract/repos/extra-i686/rpm2cpio

----------+
 PKGBUILD |    8 ++++----
 rpm2cpio |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


Property changes on: rpmextract/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /rpmextract/trunk:1-22078
   + /rpmextract/trunk:1-23360

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-07 23:52:03 UTC (rev 23360)
+++ extra-i686/PKGBUILD	2009-01-07 23:52:14 UTC (rev 23361)
@@ -3,18 +3,18 @@
 
 pkgname=rpmextract
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to convert or extract RPM archives (contains rpm2cpio)"
 arch=(i686 x86_64)
 license=('GPL')
 source=(rpmextract.sh rpm2cpio)
 url="http://www.archlinux.org"
-depends=('bash' 'libarchive' 'coreutils')
+depends=('bash' 'libarchive' 'coreutils' 'gzip')
 md5sums=('a7b527e4c210e66ef72532c606072e0d'
-         '57a4e99bedcefadc2f89006ce98d2e60')
+         '6c901e5f0e6b23f45e10de11f258f9de')
 
 build() {
-  install -m755 -d ${pkgdir}/usr/bin
+  install -d ${pkgdir}/usr/bin
   install -m755 ${srcdir}/rpmextract.sh ${pkgdir}/usr/bin/ || return 1
   install -m755 ${srcdir}/rpm2cpio ${pkgdir}/usr/bin/ || return 1
 }

Modified: extra-i686/rpm2cpio
===================================================================
--- extra-i686/rpm2cpio	2009-01-07 23:52:03 UTC (rev 23360)
+++ extra-i686/rpm2cpio	2009-01-07 23:52:14 UTC (rev 23361)
@@ -23,4 +23,4 @@
 hdrsize=`expr 8 + 16 \* $il + $dl`
 o=`expr $o + $hdrsize`
 
-dd if=$pkg ibs=$o skip=1 2>/dev/null
+dd if=$pkg ibs=$o skip=1 2>/dev/null | gunzip