diff --git a/parted-1.8.8-s390-compile.patch b/parted-1.8.8-s390-compile.patch new file mode 100644 index 0000000..cb7582c --- /dev/null +++ b/parted-1.8.8-s390-compile.patch @@ -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, diff --git a/parted.spec b/parted.spec index d27c829..6e36234 100644 --- a/parted.spec +++ b/parted.spec @@ -4,7 +4,7 @@ Summary: The GNU disk partition manipulation program Name: parted Version: 1.8.8 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ Group: Applications/System 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 Patch7: %{name}-1.8.8-dospartrec.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) BuildRequires: e2fsprogs-devel @@ -64,6 +65,7 @@ Parted library, you need to install this package. %patch6 -p1 -b .alpha %patch7 -p1 -b .dospartrec %patch8 -p1 -b .appletv +%patch9 -p1 -b .s390-compile %build %configure --enable-device-mapper --enable-selinux --disable-static @@ -121,6 +123,9 @@ fi %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc %changelog +* Thu Nov 06 2008 Joel Granados - 1.8.8-9 +- Fix the build for the s390(x) archs (#470211). + * Thu Jun 05 2008 Peter Jones - 1.8.8-8 - Fix some of the atvrecv code (and the msftres code) so that the flags actually stick.