Fix the build for s390(x).

This commit is contained in:
Joel Andres Granados Moreno 2008-11-06 13:31:20 +00:00
parent bd04deb025
commit 2e1dd1c100
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,19 @@
--- parted-1.8.8/libparted/labels/fdasd.c.orig 2008-08-28 09:07:06.000000000 -0400
+++ parted-1.8.8/libparted/labels/fdasd.c 2008-08-28 09:08:28.000000000 -0400
@@ -149,7 +149,7 @@ fdasd_error (fdasd_anchor_t *anc, enum f
case device_verification_failed:
sprintf(error, "fdasd: %s -- %s\n",
_("Device verification failed"),
- _("The specified device is not a valid DASD device"));,
+ _("The specified device is not a valid DASD device"));
break;
default:
sprintf(error, "fdasd: %s: %s\n", _("Fatal error"), str);
@@ -780,7 +780,6 @@ fdasd_get_geometry (fdasd_anchor_t *anc,
PDEBUG
int blksize = 0;
dasd_information_t dasd_info;
- char s[LINE_LENGTH];
if (ioctl(f, HDIO_GETGEO, &anc->geo) != 0)
fdasd_error(anc, unable_to_ioctl,

View File

@ -4,7 +4,7 @@
Summary: The GNU disk partition manipulation program Summary: The GNU disk partition manipulation program
Name: parted Name: parted
Version: 1.8.8 Version: 1.8.8
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
URL: http://www.gnu.org/software/parted URL: http://www.gnu.org/software/parted
@ -19,6 +19,7 @@ Patch5: %{name}-1.8.8-nofixgpt.patch
Patch6: %{name}-1.8.8-alpha.patch Patch6: %{name}-1.8.8-alpha.patch
Patch7: %{name}-1.8.8-dospartrec.patch Patch7: %{name}-1.8.8-dospartrec.patch
Patch8: %{name}-1.8.8-appletv.patch Patch8: %{name}-1.8.8-appletv.patch
Patch9: %{name}-1.8.8-s390-compile.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
@ -64,6 +65,7 @@ Parted library, you need to install this package.
%patch6 -p1 -b .alpha %patch6 -p1 -b .alpha
%patch7 -p1 -b .dospartrec %patch7 -p1 -b .dospartrec
%patch8 -p1 -b .appletv %patch8 -p1 -b .appletv
%patch9 -p1 -b .s390-compile
%build %build
%configure --enable-device-mapper --enable-selinux --disable-static %configure --enable-device-mapper --enable-selinux --disable-static
@ -121,6 +123,9 @@ fi
%{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
%changelog %changelog
* Thu Nov 06 2008 Joel Granados <jgranado@redhat.com> - 1.8.8-9
- Fix the build for the s390(x) archs (#470211).
* Thu Jun 05 2008 Peter Jones <pjones@redhat.com> - 1.8.8-8 * Thu Jun 05 2008 Peter Jones <pjones@redhat.com> - 1.8.8-8
- Fix some of the atvrecv code (and the msftres code) so that the flags - Fix some of the atvrecv code (and the msftres code) so that the flags
actually stick. actually stick.