rpms/util-linux/devel util-linux-2.13-swapon-debug.patch, NONE, 1.1 util-linux.spec, 1.119, 1.120

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/util-linux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4398

Modified Files:
	util-linux.spec 
Added Files:
	util-linux-2.13-swapon-debug.patch 
Log Message:


util-linux-2.13-swapon-debug.patch:
 swap.configure |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE util-linux-2.13-swapon-debug.patch ---
--- util-linux-2.13-pre6/mount/swap.configure.debug	2006-06-12 16:56:13.000000000 +0200
+++ util-linux-2.13-pre6/mount/swap.configure	2006-06-12 16:54:45.000000000 +0200
@@ -3,7 +3,7 @@
 
 # Prepare test
 CC=${CC-cc}
-compile="$CC -o conftest conftest.c >/dev/null 2>&1"
+compile="$CC -o conftest conftest.c"
 rm -f conftest conftest.c swapargs.h
 
 # What include files shall we try?
@@ -22,6 +22,9 @@
 echo $SWAPH >> conftest.c
 echo '#include <unistd.h>
 main(){ exit(0); swapon("/dev/null", 0); }' >> conftest.c
+echo $compile
+echo $PAGEH
+echo $SWAPH
 eval $compile
 if test -s conftest; then
 	echo "#define SWAPON_HAS_TWO_ARGS" > swapargs.h


Index: util-linux.spec
===================================================================
RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- util-linux.spec	12 Jun 2006 12:31:43 -0000	1.119
+++ util-linux.spec	12 Jun 2006 15:02:58 -0000	1.120
@@ -30,19 +30,19 @@
 Group: System Environment/Base
 
 ### Dependences
-BuildRequires: sed
-BuildRequires: pam-devel
-BuildRequires: ncurses-devel
-BuildRequires: libtermcap-devel
-BuildRequires: zlib-devel
-BuildRequires: slang-devel
-BuildRequires: texinfo
-BuildRequires: gettext-devel
-BuildRequires: libselinux-devel
-BuildRequires: e2fsprogs-devel >= 1.36
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: e2fsprogs-devel >= 1.36
+BuildRequires: gettext-devel
+BuildRequires: libselinux-devel
+BuildRequires: libtermcap-devel
+BuildRequires: ncurses-devel
+BuildRequires: pam-devel
+BuildRequires: sed
+BuildRequires: slang-devel
+BuildRequires: texinfo
+BuildRequires: zlib-devel
 
 ### Sources
 # TODO [stable]: s/2.13-pre6/%{version}/
@@ -212,6 +212,8 @@
 # 181549 - raw(8) manpage has old information about dd
 Patch242: util-linux-2.12a-raw-man-dd.patch
 
+Patch243: util-linux-2.13-swapon-debug.patch
+
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
 ########### END upstreamable
@@ -305,6 +307,7 @@
 %patch241 -p1 -b .isfull
 %patch242 -p1
 
+%patch243 -p1
 
 %build
 unset LINGUAS || :