diff --git a/udftools-1.0.0b3-warningfixes.patch b/udftools-1.0.0b3-warningfixes.patch new file mode 100644 index 0000000..5f83597 --- /dev/null +++ b/udftools-1.0.0b3-warningfixes.patch @@ -0,0 +1,90 @@ +diff -Naupr udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h udftools-1.0.0b3/cdrwtool/cdrwtool.h +--- udftools-1.0.0b3.orig/cdrwtool/cdrwtool.h 2002-11-26 08:18:50.000000000 +0100 ++++ udftools-1.0.0b3/cdrwtool/cdrwtool.h 2006-07-27 14:16:06.000000000 +0200 +@@ -226,6 +226,7 @@ int read_disc_info(int, disc_info_t *); + int read_track_info(int, track_info_t *, int); + int reserve_track(int, struct cdrw_disc *); + int close_track(int, unsigned int); ++int close_session(int, unsigned int); + int read_buffer_cap(int, struct cdrw_disc *); + int set_cd_speed(int, int); + void cdrom_close(int); +@@ -236,5 +237,6 @@ int print_disc_track_info(int); + void make_write_page(write_params_t *, struct cdrw_disc *); + void print_params(write_params_t *); + void cdrw_init_disc(struct cdrw_disc *); ++int udf_set_version(struct udf_disc *, int); + + #endif /* _CDRWTOOL_H */ +diff -Naupr udftools-1.0.0b3.orig/include/udf_endian.h udftools-1.0.0b3/include/udf_endian.h +--- udftools-1.0.0b3.orig/include/udf_endian.h 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3/include/udf_endian.h 2006-07-27 14:09:30.000000000 +0200 +@@ -23,6 +23,8 @@ + #ifndef __UDF_ENDIAN_H + #define __UDF_ENDIAN_H + ++#include ++ + #include "bswap.h" + + static inline lb_addr lelb_to_cpu(lb_addr in) +diff -Naupr udftools-1.0.0b3.orig/libudffs/unicode.c udftools-1.0.0b3/libudffs/unicode.c +--- udftools-1.0.0b3.orig/libudffs/unicode.c 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3/libudffs/unicode.c 2006-07-27 14:11:17.000000000 +0200 +@@ -169,8 +169,6 @@ error_out: + + int decode_string(struct udf_disc *disc, char *in, char *out, int inlen) + { +- int i; +- + if (disc->flags & FLAG_UTF8) + return decode_utf8(in, out, inlen); + else if (disc->flags & (FLAG_UNICODE8 | FLAG_UNICODE16)) +diff -Naupr udftools-1.0.0b3.orig/pktsetup/pktsetup.c udftools-1.0.0b3/pktsetup/pktsetup.c +--- udftools-1.0.0b3.orig/pktsetup/pktsetup.c 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3/pktsetup/pktsetup.c 2006-07-27 14:18:24.000000000 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #include + +diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.am udftools-1.0.0b3/wrudf/Makefile.am +--- udftools-1.0.0b3.orig/wrudf/Makefile.am 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3/wrudf/Makefile.am 2006-07-27 14:21:24.000000000 +0200 +@@ -1,5 +1,5 @@ + bin_PROGRAMS = wrudf + wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses +-wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ++wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h + + AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG +diff -Naupr udftools-1.0.0b3.orig/wrudf/Makefile.in udftools-1.0.0b3/wrudf/Makefile.in +--- udftools-1.0.0b3.orig/wrudf/Makefile.in 2004-02-23 10:33:48.000000000 +0100 ++++ udftools-1.0.0b3/wrudf/Makefile.in 2006-07-27 14:21:44.000000000 +0200 +@@ -85,7 +85,7 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + bin_PROGRAMS = wrudf + wrudf_LDADD = $(top_builddir)/libudffs/libudffs.la -lreadline -lncurses +-wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ++wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-pc.c wrudf.h ide-pc.h ../include/ecma_167.h ../include/osta_udf.h ../include/bswap.h ../include/libudffs.h + + AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -DDEBUG + subdir = wrudf +diff -Naupr udftools-1.0.0b3.orig/wrudf/wrudf.h udftools-1.0.0b3/wrudf/wrudf.h +--- udftools-1.0.0b3.orig/wrudf/wrudf.h 2002-11-26 08:18:51.000000000 +0100 ++++ udftools-1.0.0b3/wrudf/wrudf.h 2006-07-27 14:22:33.000000000 +0200 +@@ -23,9 +23,11 @@ + #include + #include + #include ++#include + + #include "ecma_167.h" + #include "osta_udf.h" ++#include "libudffs.h" + + struct generic_desc + { diff --git a/udftools.spec b/udftools.spec index a47403c..24ab97b 100644 --- a/udftools.spec +++ b/udftools.spec @@ -1,7 +1,7 @@ Summary: Linux UDF Filesystem userspace utilities Name: udftools Version: 1.0.0b3 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Archiving URL: http://sourceforge.net/projects/linux-udf/ @@ -9,8 +9,9 @@ Source: http://dl.sf.net/linux-udf/udftools-%{version}.tar.gz Patch0: udftools-1.0.0b3-pktsetup-chardev.patch Patch1: udftools-1.0.0b3-mkudffs-bigendian.patch Patch2: udftools-1.0.0b3-wrudf-gcc4.patch +Patch3: udftools-1.0.0b3-warningfixes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: readline-devel +BuildRequires: readline-devel, ncurses-devel %description Linux UDF Filesystem userspace utilities. @@ -21,6 +22,7 @@ Linux UDF Filesystem userspace utilities. %patch0 -p1 -b .pktsetup-chardev %patch1 -p1 -b .mkudffs-bigendian %patch2 -p1 -b .wrudf-gcc4 +%patch3 -p1 -b .warningfixes %build @@ -47,6 +49,12 @@ Linux UDF Filesystem userspace utilities. %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.0b3-6 +- FC6 rebuild. +- Add ncurses-devel build requirement, since it's not pulled in anymore. +- Add patch to fix as many trivial warnings as possible. Some stuff seems to + still not be 64bit clean, though. + * Mon Mar 6 2006 Matthias Saou 1.0.0b3-5 - FC5 rebuild.