From e2f8cd5e1b40beeea73f4fe7cf03211b318434f8 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Mon, 27 Aug 2007 23:48:11 +0000
Subject: [PATCH] - upgrade to stable util-linux-ng release

---
 .cvsignore         |  2 +-
 sources            |  2 +-
 util-linux-ng.spec | 25 +++++++++++++------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f0251f3..a8b06f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-util-linux-ng-2.13-20070821git.tar.bz2
 floppy-0.16.tar.bz2
+util-linux-ng-2.13.tar.bz2
diff --git a/sources b/sources
index bf2c743..2270412 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3e9a81b75b594263af5e85cd80c44d99  util-linux-ng-2.13-20070821git.tar.bz2
 7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2
+2175a6e64ba0cf8ff05402eaee33e4b0  util-linux-ng-2.13.tar.bz2
diff --git a/util-linux-ng.spec b/util-linux-ng.spec
index 135db8f..c8b445f 100644
--- a/util-linux-ng.spec
+++ b/util-linux-ng.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.13
-Release: 0.59%{?dist}
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -25,8 +25,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 ### Dependences
 BuildRequires: audit-libs-devel >= 1.0.6
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: e2fsprogs-devel >= 1.36
 BuildRequires: gettext-devel
 BuildRequires: libselinux-devel
@@ -38,7 +36,7 @@ BuildRequires: zlib-devel
 BuildRequires: popt-devel
 
 ### Sources
-Source0: util-linux-ng-%{version}-20070821git.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-2.13.tar.bz2
 Source1: util-linux-ng-login.pamd
 Source2: util-linux-ng-remote.pamd
 Source3: util-linux-ng-chsh-chfn.pamd
@@ -54,21 +52,21 @@ Conflicts: initscripts <= 4.58
 Conflicts: kernel < 2.2.12-7
 
 # old versions of util-linux have been splited to more sub-packages
-Obsoletes: mount <= 2.11, losetup <= 2.11
-Provides: mount = %{version}, losetup = %{version}
+Obsoletes: mount < 2.11, losetup < 2.11
+Provides: mount = %{version}-%{release}, losetup = %{version}-%{release}
 # Robert Love's schedutils have been merged to util-linux-2.13-pre1
-Obsoletes: schedutils <= 1.5
-Provides: schedutils = %{version}
+Obsoletes: schedutils < 1.5
+Provides: schedutils = %{version}-%{release}
 # fork and rename from util-linux to util-linux-ng
-Obsoletes: util-linux <= 2.13.0.51
+Obsoletes: util-linux < 2.13.1
 Provides: util-linux = %{version}-%{release}
 
 # setarch merge in util-linux-ng-2.13
 %ifarch sparc sparc64
 Obsoletes: sparc32
 %endif
-Obsoletes: setarch <= 2.0-99
-Provides: setarch = %{version}
+Obsoletes: setarch < 2.1
+Provides: setarch = %{version}-%{release}
 
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
@@ -115,7 +113,7 @@ others, Util-linux contains the fdisk configuration tool and the login
 program.
 
 %prep
-%setup -q -a 11 -n util-linux-ng-2.13-rc3
+%setup -q -a 11
 cp %{SOURCE8} %{SOURCE9} .
 
 %patch0 -p1
@@ -523,6 +521,9 @@ exit 0
 /sbin/losetup
 
 %changelog
+* Tue Aug 28 2007 Karel Zak <kzak@redhat.com> 2.13-1
+- upgrade to stable util-linux-ng release
+
 * Fri Aug 24 2007 Karel Zak <kzak@redhat.com> 2.13-0.59
 - add release number to util-linux Provides and increment setarch Obsoletes
 - fix #254114 - spec typo