From 9edbe38fb368e91f7b3783f7a9dfd09ad0602db4 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Fri, 24 Aug 2007 12:51:50 +0000
Subject: [PATCH] - add release number to util-linux Provides and increment
 setarch Obsoletes - fix #254114 - spec typo - upgrade to floppy-0.16

---
 .cvsignore                              | 2 +-
 sources                                 | 2 +-
 util-linux-ng-2.13-floppy-generic.patch | 4 ++--
 util-linux-ng-2.13-floppy-locale.patch  | 4 ++--
 util-linux-ng.spec                      | 9 +++++----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d67e189..f0251f3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 util-linux-ng-2.13-20070821git.tar.bz2
-floppy-0.12.tar.gz
+floppy-0.16.tar.bz2
diff --git a/sources b/sources
index bd02e67..bf2c743 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 3e9a81b75b594263af5e85cd80c44d99  util-linux-ng-2.13-20070821git.tar.bz2
-7d3ac81855e26687dada6a31d2677875  floppy-0.12.tar.gz
+7eeb9a6f7a258174bf0fa80f1370788d  floppy-0.16.tar.bz2
diff --git a/util-linux-ng-2.13-floppy-generic.patch b/util-linux-ng-2.13-floppy-generic.patch
index ec33468..ffc4750 100644
--- a/util-linux-ng-2.13-floppy-generic.patch
+++ b/util-linux-ng-2.13-floppy-generic.patch
@@ -1,5 +1,5 @@
---- util-linux-2.12p/floppy-0.12/floppyfloppy.c.generic	2001-02-13 01:15:38.000000000 +0100
-+++ util-linux-2.12p/floppy-0.12/floppyfloppy.c	2005-09-30 15:38:08.000000000 +0200
+--- util-linux-2.12p/floppy-0.16/floppyfloppy.c.generic	2001-02-13 01:15:38.000000000 +0100
++++ util-linux-2.12p/floppy-0.16/floppyfloppy.c	2005-09-30 15:38:08.000000000 +0200
 @@ -264,6 +264,33 @@
  #endif
  }
diff --git a/util-linux-ng-2.13-floppy-locale.patch b/util-linux-ng-2.13-floppy-locale.patch
index feb0511..9b8142f 100644
--- a/util-linux-ng-2.13-floppy-locale.patch
+++ b/util-linux-ng-2.13-floppy-locale.patch
@@ -1,5 +1,5 @@
---- util-linux-ng-2.13-rc3/floppy-0.12/superfloppy.c.kzak	2001-07-14 05:26:16.000000000 +0200
-+++ util-linux-ng-2.13-rc3/floppy-0.12/superfloppy.c	2007-08-13 13:14:53.000000000 +0200
+--- util-linux-ng-2.13-rc3/floppy-0.16/superfloppy.c.kzak	2001-07-14 05:26:16.000000000 +0200
++++ util-linux-ng-2.13-rc3/floppy-0.16/superfloppy.c	2007-08-13 13:14:53.000000000 +0200
 @@ -12,6 +12,7 @@
  #include <errno.h>
  #include <popt.h>
diff --git a/util-linux-ng.spec b/util-linux-ng.spec
index ba88e3d..051b006 100644
--- a/util-linux-ng.spec
+++ b/util-linux-ng.spec
@@ -15,7 +15,7 @@ URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
 %endif
 
 ### Macros
-%define floppyver 0.12
+%define floppyver 0.16
 %define no_hwclock_archs s390 s390x
 %define no_cfsfdisk_archs sparc ssparc64
 %define cytune_archs %{ix86} alpha armv4l
@@ -35,6 +35,7 @@ BuildRequires: pam-devel
 BuildRequires: slang-devel
 BuildRequires: texinfo
 BuildRequires: zlib-devel
+BuildRequires: popt
 
 ### Sources
 Source0: util-linux-ng-%{version}-20070821git.tar.bz2
@@ -44,7 +45,7 @@ Source3: util-linux-ng-chsh-chfn.pamd
 Source4: util-linux-ng-60-raw.rules
 Source8: nologin.c
 Source9: nologin.8
-Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.gz
+Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
 
 ### Obsoletes & Conflicts & Provides
 %ifarch alpha
@@ -159,8 +160,7 @@ make %{?_smp_mflags}
 
 # build floppy stuff
 pushd floppy-%{floppyver}
-# We have to disable floppygtk somehow...
-%configure --with-gtk-prefix=/asfd/jkl
+%configure --disable-gtk2
 make %{?_smp_mflags}
 popd
 
@@ -526,6 +526,7 @@ exit 0
 * 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
+- upgrade to floppy-0.16
 
 * Wed Aug 22 2007 Jesse Keating <jkeating@redhat.com>  2.13-0.58
 - Obsolete a sufficiently high enough version of setarch