rpms/util-linux-ng/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 util-linux-ng-2.13-floppy-generic.patch, 1.1, 1.2 util-linux-ng-2.13-floppy-locale.patch, 1.1, 1.2 util-linux-ng.spec, 1.7, 1.8

[Karel Zak (kzak)]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25365

Modified Files:
	.cvsignore sources util-linux-ng-2.13-floppy-generic.patch 
	util-linux-ng-2.13-floppy-locale.patch util-linux-ng.spec 
Log Message:
* Fri Aug 24 2007 Karel Zak <kzak at 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Aug 2007 10:49:18 -0000	1.3
+++ .cvsignore	24 Aug 2007 12:51:50 -0000	1.4
@@ -1,2 +1,2 @@
 util-linux-ng-2.13-20070821git.tar.bz2
-floppy-0.12.tar.gz
+floppy-0.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Aug 2007 10:49:18 -0000	1.3
+++ sources	24 Aug 2007 12:51:50 -0000	1.4
@@ -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

util-linux-ng-2.13-floppy-generic.patch:

Index: util-linux-ng-2.13-floppy-generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-floppy-generic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.13-floppy-generic.patch	20 Aug 2007 10:48:20 -0000	1.1
+++ util-linux-ng-2.13-floppy-generic.patch	24 Aug 2007 12:51:50 -0000	1.2
@@ -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
  }

util-linux-ng-2.13-floppy-locale.patch:

Index: util-linux-ng-2.13-floppy-locale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng-2.13-floppy-locale.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util-linux-ng-2.13-floppy-locale.patch	20 Aug 2007 10:48:20 -0000	1.1
+++ util-linux-ng-2.13-floppy-locale.patch	24 Aug 2007 12:51:50 -0000	1.2
@@ -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>


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util-linux-ng.spec	24 Aug 2007 11:41:39 -0000	1.7
+++ util-linux-ng.spec	24 Aug 2007 12:51:50 -0000	1.8
@@ -15,7 +15,7 @@
 %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: slang-devel
 BuildRequires: texinfo
 BuildRequires: zlib-devel
+BuildRequires: popt
 
 ### Sources
 Source0: util-linux-ng-%{version}-20070821git.tar.bz2
@@ -44,7 +45,7 @@
 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 @@
 
 # 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 @@
 * Fri Aug 24 2007 Karel Zak <kzak at 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 at redhat.com>  2.13-0.58
 - Obsolete a sufficiently high enough version of setarch