From ba434769acb01ebe4b720e1fd221e9eb9c0562e6317972d89463b1cdc0922415 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 25 Jul 2008 02:22:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/parted?expand=0&rev=21

---
 parted-fdasd-compile-fixes | 13 +++++++++++++
 parted-no-inttypes-include | 27 +++++++++++++++++++++++++++
 parted.changes             |  6 ++++++
 parted.spec                |  9 ++++++++-
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 parted-fdasd-compile-fixes
 create mode 100644 parted-no-inttypes-include

diff --git a/parted-fdasd-compile-fixes b/parted-fdasd-compile-fixes
new file mode 100644
index 0000000..0de1d74
--- /dev/null
+++ b/parted-fdasd-compile-fixes
@@ -0,0 +1,13 @@
+Index: parted-1.8.8/libparted/labels/fdasd.c
+===================================================================
+--- parted-1.8.8.orig/libparted/labels/fdasd.c
++++ parted-1.8.8/libparted/labels/fdasd.c
+@@ -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);
diff --git a/parted-no-inttypes-include b/parted-no-inttypes-include
new file mode 100644
index 0000000..24f6e26
--- /dev/null
+++ b/parted-no-inttypes-include
@@ -0,0 +1,27 @@
+Index: parted-1.8.8/libparted/fs/ext2/ext2.h
+===================================================================
+--- parted-1.8.8.orig/libparted/fs/ext2/ext2.h
++++ parted-1.8.8/libparted/fs/ext2/ext2.h
+@@ -24,10 +24,6 @@
+ #include <sys/types.h>
+ #include "tune.h"
+ 
+-#if HAVE_INTTYPES_H
+-#  include <inttypes.h>
+-#endif
+-
+ #if ENABLE_NLS
+ #  include <libintl.h>
+ #  define _(String) dgettext (PACKAGE, String)
+Index: parted-1.8.8/libparted/labels/gpt.c
+===================================================================
+--- parted-1.8.8.orig/libparted/labels/gpt.c
++++ parted-1.8.8/libparted/labels/gpt.c
+@@ -31,7 +31,6 @@
+ #include <parted/debug.h>
+ #include <parted/endian.h>
+ #include <parted/crc32.h>
+-#include <inttypes.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
diff --git a/parted.changes b/parted.changes
index 0c6a42d..dd1e279 100644
--- a/parted.changes
+++ b/parted.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 22 13:27:27 CEST 2008 - hare@suse.de
+
+- Fix fdasd.c compilation
+- Don't include broken inttypes.h
+
 -------------------------------------------------------------------
 Fri Jul 18 10:03:52 CEST 2008 - agraf@suse.de
 
diff --git a/parted.spec b/parted.spec
index 097cf37..70e716c 100644
--- a/parted.spec
+++ b/parted.spec
@@ -18,7 +18,7 @@ License:        GPL v2 or later
 Group:          System/Filesystems
 Summary:        GNU partitioner
 Version:        1.8.8
-Release:        53
+Release:        56
 Source0:        %{name}-%{version}.tar.bz2
 Patch:          always-resize-part.dif
 Patch1:         parted-type.patch
@@ -36,6 +36,8 @@ Patch51:        parted.tty.patch
 Patch52:        parted.no-O_DIRECT.patch
 Patch53:        largest_partition_number.patch
 Patch54:        parted-gpt-mbr-sync.patch
+Patch55:        parted-fdasd-compile-fixes
+Patch56:        parted-no-inttypes-include
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.gnu.org/software/parted/
 PreReq:         %install_info_prereq
@@ -89,6 +91,8 @@ Authors:
 %patch52 -p1
 %patch53 -p1
 %patch54
+%patch55 -p1
+%patch56 -p1
 
 %build
 AUTOPOINT=true autoreconf --force --install
@@ -132,6 +136,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/*.so
 
 %changelog
+* Tue Jul 22 2008 hare@suse.de
+- Fix fdasd.c compilation
+- Don't include broken inttypes.h
 * Fri Jul 18 2008 agraf@suse.de
 - add GPT sync, so whenever the GPT is modified, fake MBR entries
   for the first 4 partitions will be created. This fixes booting