From e56d1ef18a4e3db4aab77687a94fa0577c954c91394621a27816d3645f54755f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 4 Dec 2009 08:56:26 +0000
Subject: [PATCH] Accepting request 25299 from Base:System

Copy from Base:System/util-linux based on submit request 25299 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/25299
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=83
---
 util-linux.changes |  5 +++++
 util-linux.spec    | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/util-linux.changes b/util-linux.changes
index e0cabea..9373009 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 30 17:05:38 CET 2009 - meissner@suse.de
+
+- exclude sparc correctly -> %sparc bnc#559180
+
 -------------------------------------------------------------------
 Sun Nov 15 14:04:48 CET 2009 - meissner@suse.de
 
diff --git a/util-linux.spec b/util-linux.spec
index d908025..caa5b31 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -25,11 +25,11 @@ Provides:       util rawio raw base schedutils uuid-runtime
 Obsoletes:      util rawio raw base schedutils uuid-runtime
 Supplements:    filesystem(minix)
 PreReq:         %install_info_prereq permissions
-License:        BSD 3-clause (or similar) ; GPL v2 or later
+License:        BSD3c(or similar) ; GPLv2+
 Group:          System/Base
 AutoReqProv:    on
 Version:        2.16
-Release:        6
+Release:        7
 Requires:       %name-lang = %{version}
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
@@ -95,7 +95,7 @@ that are necessary for a Linux system to function. It contains the
 mount program, the fdisk configuration tool, and more.
 
 %package -n libblkid1
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Filesystem detection library
 Group:          System/Filesystems
 AutoReqProv:    on
@@ -104,7 +104,7 @@ AutoReqProv:    on
 Library for filesystem detection.
 
 %package -n libblkid-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Development files for the filesystem detection library
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
@@ -115,7 +115,7 @@ Files needed to develop applications using the library for filesystem
 detection.
 
 %package -n uuidd
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Utilities for the Second Extended File System
 Group:          System/Filesystems
 AutoReqProv:    on
@@ -127,7 +127,7 @@ under Linux. Included in this package are: chattr, lsattr, mke2fs,
 mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
 
 %package -n libuuid1
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Library to generate UUIDs
 Group:          System/Filesystems
 AutoReqProv:    on
@@ -136,7 +136,7 @@ AutoReqProv:    on
 A library to generate universally unique IDs (UUIDs).
 
 %package -n libuuid-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Development files for libuuid1
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
@@ -336,7 +336,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/hwclock.8*
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/klogconsole.8*
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/tunelp.8*
 %endif
-%ifarch ia64 sparc
+%ifarch ia64 %sparc
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/cfdisk.8*
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/sfdisk.8*
 rm -f $RPM_BUILD_ROOT/sbin/cfdisk
@@ -604,7 +604,7 @@ fi
 /sbin/fdisk
 %{_mandir}/man8/fdisk.8.gz
 %endif
-%ifnarch sparc ia64
+%ifnarch %sparc ia64
 %doc fdisk/README.cfdisk
 %{_mandir}/man8/cfdisk.8.gz
 %{_mandir}/man8/sfdisk.8.gz