[arch-commits] Commit in parted/repos (5 files)

Thu Dec 3 00:22:48 UTC 2009

Date: Wednesday, December 2, 2009 @ 19:22:47
  Author: giovanni
Revision: 60315

Merged revisions 59984,60149,60300,60313 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/parted/trunk

........
  r59984 | giovanni | 2009-11-29 13:01:07 -0800 (dom, 29 nov 2009) | 2 lines
  
  upgpkg: parted 1.9.0-1
      upstream release
........
  r60149 | giovanni | 2009-12-01 00:14:31 -0800 (mar, 01 dic 2009) | 2 lines
  
  upgpkg: parted 1.9.0-2
      Fixed FS17332
........
  r60300 | giovanni | 2009-12-02 15:05:16 -0800 (mer, 02 dic 2009) | 2 lines
  
  upgpkg: parted 1.9.0-3
      Added a critical patch
........
  r60313 | giovanni | 2009-12-02 16:20:40 -0800 (mer, 02 dic 2009) | 1 line
  
  cleanup
........

Added:
  parted/repos/extra-x86_64/parted-1.9.0.patch
    (from rev 60313, parted/trunk/parted-1.9.0.patch)
  parted/repos/extra-x86_64/parted.install
    (from rev 60313, parted/trunk/parted.install)
Modified:
  parted/repos/extra-x86_64/	(properties)
  parted/repos/extra-x86_64/PKGBUILD
Deleted:
  parted/repos/extra-x86_64/parted-1.7.1-fix-seg.patch

----------------------------+
 PKGBUILD                   |   33 ++++++++++++++++++++-------------
 parted-1.7.1-fix-seg.patch |   13 -------------
 parted-1.9.0.patch         |   30 ++++++++++++++++++++++++++++++
 parted.install             |   18 ++++++++++++++++++
 4 files changed, 68 insertions(+), 26 deletions(-)


Property changes on: parted/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /parted/trunk:1-42776
   + /parted/trunk:1-60314

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2009-12-03 00:21:44 UTC (rev 60314)
+++ extra-x86_64/PKGBUILD	2009-12-03 00:22:47 UTC (rev 60315)
@@ -1,25 +1,32 @@
 # $Id$
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=parted
-pkgver=1.8.8
+pkgver=1.9.0
 pkgrel=3
 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.gnu.org/software/parted/parted.html"
-depends=('e2fsprogs' 'ncurses>=5.6-7' 'readline>=6.0.00')
-source=(ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz parted-1.7.1-fix-seg.patch)
-md5sums=('0d494591731082ec57cc18627728124a' '88f3c5b45fdd1d3dce70a1a19bf48481')
-options=(!libtool)
+depends=('device-mapper' 'e2fsprogs')
+options=('!libtool')
+install=parted.install
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        parted-1.9.0.patch)
+md5sums=('055305bc7bcf472ce38f9abf69a9d94d'
+         '0a1622cdca6e161ae2a40083b2d046bd')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  #Arch64 fix - still needed?
-  [ "$CARCH" = "x86_64" ] &&  patch -Np1 -i ../parted-1.7.1-fix-seg.patch
-  ./configure --prefix=/usr --disable-debug --disable-Werror
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # See http://gparted.sourceforge.net/news.php
+  patch -Np1 -i ${srcdir}/parted-1.9.0.patch || return 1
+
+  ./configure --prefix=/usr \
+              --disable-debug \
+              --disable-rpath \
+              --disable-Werror || return 1
+
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm $pkgdir/usr/share/info/dir
+  make DESTDIR="${pkgdir}" install || return 1
 }

Deleted: extra-x86_64/parted-1.7.1-fix-seg.patch
===================================================================
--- extra-x86_64/parted-1.7.1-fix-seg.patch	2009-12-03 00:21:44 UTC (rev 60314)
+++ extra-x86_64/parted-1.7.1-fix-seg.patch	2009-12-03 00:22:47 UTC (rev 60315)
@@ -1,13 +0,0 @@
---- parted-1.7.1/libparted/fs/hfs/probe.c	2006-05-25 13:28:58.000000000 -0400
-+++ parted-1.7.1.new/libparted/fs/hfs/probe.c	2006-06-09 16:58:35.000000000 -0400
-@@ -42,8 +42,9 @@
- {
- 	PedDevice* dev;
- 
-+	dev = geom->dev;
- 	PED_ASSERT (geom != NULL, return 0);
--	PED_ASSERT ((dev = geom->dev) != NULL, return 0);
-+	PED_ASSERT (dev != NULL, return 0);
- 
- 	if (dev->sector_size != PED_SECTOR_SIZE_DEFAULT) {
- 		ped_exception_throw (

Copied: parted/repos/extra-x86_64/parted-1.9.0.patch (from rev 60313, parted/trunk/parted-1.9.0.patch)
===================================================================
--- extra-x86_64/parted-1.9.0.patch	                        (rev 0)
+++ extra-x86_64/parted-1.9.0.patch	2009-12-03 00:22:47 UTC (rev 60315)
@@ -0,0 +1,30 @@
+--- a/libparted/disk.c	2009-07-23 10:52:08.000000000 -0700
++++ b/libparted/disk.c	2009-12-02 23:53:24.000000000 -0800
+@@ -489,9 +489,25 @@
+ int
+ ped_disk_commit (PedDisk* disk)
+ {
++        /* Open the device here, so that the underlying fd is not closed
++           between commit_to_dev and commit_to_os (closing causes unwanted
++           udev events to be sent under Linux). */
++	if (!ped_device_open (disk->dev))
++		goto error;
++
+ 	if (!ped_disk_commit_to_dev (disk))
+-		return 0;
+-	return ped_disk_commit_to_os (disk);
++		goto error_close_dev;
++
++	if (!ped_disk_commit_to_os (disk))
++		goto error_close_dev;
++
++	ped_device_close (disk->dev);
++	return 1;
++
++error_close_dev:
++	ped_device_close (disk->dev);
++error:
++	return 0;
+ }
+ 
+ /**

Copied: parted/repos/extra-x86_64/parted.install (from rev 60313, parted/trunk/parted.install)
===================================================================
--- extra-x86_64/parted.install	                        (rev 0)
+++ extra-x86_64/parted.install	2009-12-03 00:22:47 UTC (rev 60315)
@@ -0,0 +1,18 @@
+info_dir=/usr/share/info
+info_files=(parted.info)
+
+post_install() {
+  for f in ${info_files[@]}; do
+    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for f in ${info_files[@]}; do
+    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  done
+}


