Hello community, here is the log from the commit of package wodim checked in at Tue Oct 3 18:13:22 CEST 2006. -------- --- wodim/wodim.changes 2006-09-21 11:12:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2006-10-03 15:29:49.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 3 11:35:50 CEST 2006 - nadvornik@suse.cz + +- removed incorrect check for grown files [#207619] +- build with -DCLONE_WRITE [#209434] + +------------------------------------------------------------------- New: ---- cdrkit-clone.patch cdrkit-mkisofs-grow-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.z9oUHq/_old 2006-10-03 18:11:02.000000000 +0200 +++ /var/tmp/diff_new_pack.z9oUHq/_new 2006-10-03 18:11:02.000000000 +0200 @@ -19,18 +19,20 @@ Provides: cdrecord Obsoletes: cdrecord Version: 1.0pre5 -Release: 1 +Release: 4 Source: cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c Source3: geteltorito.pl Source4: README.geteltorito Source5: README.SUSE -Patch9: cdrkit-mkisofs-fail-on-large-file.patch -Patch11: cdrkit-gcc-workaround.patch -Patch12: cdrkit-perms.patch -Patch15: cdrkit-HZ.patch -Patch16: cdrkit-dvd-fix.patch +Patch1: cdrkit-mkisofs-fail-on-large-file.patch +Patch2: cdrkit-gcc-workaround.patch +Patch3: cdrkit-perms.patch +Patch4: cdrkit-HZ.patch +Patch5: cdrkit-dvd-fix.patch +Patch6: cdrkit-mkisofs-grow-check.patch +Patch7: cdrkit-clone.patch URL: http://cdrecord.berlios.de/old/private/cdrecord.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tool for Writing CDRs @@ -97,15 +99,13 @@ %prep %setup -q -n cdrkit-%{version} -%patch9 -%patch11 -%patch12 -%patch15 -%patch16 -# -#cd conf -#autoconf -# +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 +%patch7 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -221,6 +221,9 @@ /usr/bin/list_audio_tracks %changelog -n wodim +* Tue Oct 03 2006 - nadvornik@suse.cz +- removed incorrect check for grown files [#207619] +- build with -DCLONE_WRITE [#209434] * Thu Sep 21 2006 - nadvornik@suse.cz - switched to cdrkit package, cdrecord is replaced by wodim - UTF8, dvd and other patches are integrated in upstream ++++++ cdrkit-clone.patch ++++++ --- cdrecord/CMakeLists.txt +++ cdrecord/CMakeLists.txt @@ -15,7 +15,7 @@ LINK_DIRECTORIES(../libschily ../libscg ../libdeflt ../libedc) -ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC) +ADD_DEFINITIONS(-DHAVE_LIB_EDC_ECC -DCLONE_WRITE) ADD_EXECUTABLE (wodim ${CDRECORD_SRCS}) TARGET_LINK_LIBRARIES(wodim ${SCG_LIBS} schily deflt libedc ${CAPLINK}) --- readcd/CMakeLists.txt +++ readcd/CMakeLists.txt @@ -5,6 +5,9 @@ AUX_SOURCE_DIRECTORY(. READCD_SRCS) LINK_DIRECTORIES(../libschily ../libscg ../libdeflt) + +ADD_DEFINITIONS(-DCLONE_WRITE) + ADD_EXECUTABLE (readcd ${READCD_SRCS}) TARGET_LINK_LIBRARIES(readcd ${SCG_LIBS} schily deflt) SET_TARGET_PROPERTIES(readcd PROPERTIES SKIP_BUILD_RPATH TRUE) ++++++ cdrkit-mkisofs-grow-check.patch ++++++ --- mkisofs/write.c +++ mkisofs/write.c @@ -513,7 +513,7 @@ memset(buffer, 0, use); seterrno(0); amt = fread(buffer, 1, use, infile); - if (amt < use && amt != remain) { + if (amt < use && amt < remain) { /* * Note that mkisofs is not star and no 100% archiver. * We only detect file growth if the new size does not @@ -522,16 +522,12 @@ if (geterrno() == 0) { #ifdef USE_LIBSCHILY comerrno(EX_BAD, - "File '%s' did %s.\n", - filename, - amt < remain ? - "shrink":"grow"); + "File '%s' did shrink.\n", + filename); #else fprintf(stderr, - "File '%s' did %s.\n", - filename, - amt < remain ? - "shrink":"grow"); + "File '%s' did shrink.\n", + filename); exit(EX_BAD); #endif } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org