From 880e5dc348ae8413894fe604089674df6f49808b0e2f879c7ebc8b0ebf84f500 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 21 Oct 2009 00:02:09 +0000
Subject: [PATCH] Accepting request 22629 from Base:System
Copy from Base:System/util-linux based on submit request 22629 from user dirkmueller
OBS-URL: https://build.opensuse.org/request/show/22629
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=80
---
baselibs.conf | 4 ++++
util-linux.changes | 10 ++++++++++
util-linux.spec | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/baselibs.conf b/baselibs.conf
index 4ce6559..5d89a17 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,9 +1,13 @@
libuuid1
libuuid-devel
+ requires -libuuid-<targettype>
+ requires "libuuid1-<targettype> = <version>"
requires -libblkid-<targettype>
requires "libblkid1-<targettype> = <version>"
libblkid1
obsoletes "e2fsprogs-<targettype> <= <version>"
libblkid-devel
+ requires -libblkid-<targettype>
+ requires "libblkid1-<targettype> = <version>"
requires -libuuid-<targettype>
requires "libuuid1-<targettype> = <version>"
diff --git a/util-linux.changes b/util-linux.changes
index 42af8cc..820f4e0 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de
+
+- fix typo in baselibs.conf change
+
+-------------------------------------------------------------------
+Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de
+
+- Fix requires of 32-bit devel packages.
+
-------------------------------------------------------------------
Tue Sep 29 12:58:37 UTC 2009 - hvogel@novell.com
diff --git a/util-linux.spec b/util-linux.spec
index 31177ab..7f0c6f7 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -29,7 +29,7 @@ License: BSD 3-clause (or similar) ; GPL v2 or later
Group: System/Base
AutoReqProv: on
Version: 2.16
-Release: 3
+Release: 4
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