From 78ce902c9f88bd092af9c64ec009fe668826f207411264a867322f81ac452730 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 9 Oct 2013 15:02:58 +0000
Subject: [PATCH] Accepting request 202697 from home:Andreas_Schwab:Factory
- No *fdisk on m68k
OBS-URL: https://build.opensuse.org/request/show/202697
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=188
---
util-linux.changes | 5 +++++
util-linux.spec | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/util-linux.changes b/util-linux.changes
index ab3bc3a..11b484c 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 9 10:00:55 UTC 2013 - schwab@suse.de
+
+- No *fdisk on m68k
+
-------------------------------------------------------------------
Wed Oct 2 18:55:22 CEST 2013 - sbrabec@suse.cz
diff --git a/util-linux.spec b/util-linux.spec
index d3ca846..3322308 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -433,7 +433,7 @@ rm -f %{buildroot}/%{_mandir}/man8/hwclock.8*
rm -f %{buildroot}/%{_mandir}/man8/klogconsole.8*
rm -f %{buildroot}/%{_mandir}/man8/tunelp.8*
%endif
-%ifarch ia64 %sparc
+%ifarch ia64 %sparc m68k
rm -f %{buildroot}/%{_mandir}/man8/cfdisk.8*
rm -f %{buildroot}/%{_mandir}/man8/sfdisk.8*
rm -f %{buildroot}%{_sbindir}/cfdisk
@@ -445,7 +445,7 @@ rm -f %{buildroot}%{_sbindir}/sfdisk
rm -f %{buildroot}/sbin/sfdisk
#EndUsrMerge
%endif
-%ifarch ia64
+%ifarch ia64 m68k
rm -f %{buildroot}%{_sbindir}/fdisk
#UsrMerge
rm -f %{buildroot}/sbin/fdisk
@@ -829,7 +829,7 @@ fi
%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh
# FIXME: Fix directory ownership.
%{_datadir}/bash-completion
-%ifnarch ia64
+%ifnarch ia64 m68k
#XXX: post our patches upstream
#XXX: call fdupes on /usr/share/man
#UsrMerge
@@ -838,7 +838,7 @@ fi
%{_sbindir}/fdisk
%{_mandir}/man8/fdisk.8.gz
%endif
-%ifnarch %sparc ia64
+%ifnarch %sparc ia64 m68k
%{_mandir}/man8/cfdisk.8.gz
%{_mandir}/man8/sfdisk.8.gz
#UsrMerge