rpms/parted/devel parted-1.9.0-dasd-533808.patch, 1.1, 1.2 parted.spec, 1.156, 1.157

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10947

Modified Files:
	parted-1.9.0-dasd-533808.patch parted.spec 
Log Message:
* Wed Nov 11 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-23
- Fix parted not building on s390


parted-1.9.0-dasd-533808.patch:
 arch/linux.c  |   15 ++++++++++-----
 arch/linux.h  |    1 +
 labels/dasd.c |   20 ++++++++++++++++----
 3 files changed, 27 insertions(+), 9 deletions(-)

Index: parted-1.9.0-dasd-533808.patch
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted-1.9.0-dasd-533808.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- parted-1.9.0-dasd-533808.patch	9 Nov 2009 17:46:21 -0000	1.1
+++ parted-1.9.0-dasd-533808.patch	11 Nov 2009 21:08:51 -0000	1.2
@@ -20,15 +20,14 @@ diff -up parted-1.9.0/libparted/arch/lin
  
          if (!_device_stat (dev, &dev_stat))
                  goto error;
-@@ -1115,15 +1118,18 @@ init_dasd (PedDevice* dev, const char* m
+@@ -1115,15 +1118,17 @@ init_dasd (PedDevice* dev, const char* m
                  dev->hw_geom = dev->bios_geom;
          }
  
 +        if (!ioctl(arch_specific->fd, BIODASDINFO, &dasd_info)) {
 +                arch_specific->devno = dasd_info.devno;
 +        } else {
-+                arch_specific->devno = arch_specific->major * 256 +
-+                                       arch_specific->minor;
++                arch_specific->devno = -1;
 +        }
 +
          dev->model = strdup (model_name);


Index: parted.spec
===================================================================
RCS file: /cvs/extras/rpms/parted/devel/parted.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- parted.spec	9 Nov 2009 17:46:21 -0000	1.156
+++ parted.spec	11 Nov 2009 21:08:51 -0000	1.157
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -149,6 +149,9 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Wed Nov 11 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-23
+- Fix parted not building on s390
+
 * Mon Nov  9 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-22
 - Fix error when creating a fresh dasd disk on a dasd device
   with a corrupted dasd label (#533808)