Hello community, here is the log from the commit of package wodim checked in at Fri Oct 6 19:28:51 CEST 2006. -------- --- wodim/wodim.changes 2006-10-03 15:29:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2006-10-06 14:06:56.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 6 14:06:02 CEST 2006 - nadvornik@suse.cz + +- moved include files to /usr/include/wodim + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.hulmGd/_old 2006-10-06 19:28:27.000000000 +0200 +++ /var/tmp/diff_new_pack.hulmGd/_new 2006-10-06 19:28:27.000000000 +0200 @@ -19,7 +19,7 @@ Provides: cdrecord Obsoletes: cdrecord Version: 1.0pre5 -Release: 4 +Release: 5 Source: cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c @@ -33,7 +33,7 @@ Patch5: cdrkit-dvd-fix.patch Patch6: cdrkit-mkisofs-grow-check.patch Patch7: cdrkit-clone.patch -URL: http://cdrecord.berlios.de/old/private/cdrecord.html +URL: http://cdrkit.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tool for Writing CDRs @@ -145,11 +145,11 @@ libunls/libunls.a \ $RPM_BUILD_ROOT/usr/%_lib rm -rf $RPM_BUILD_ROOT/usr/include -mkdir -p $RPM_BUILD_ROOT/usr/include/cdrecord -cp -a include/*.h $RPM_BUILD_ROOT/usr/include/cdrecord -cp -a libscg/*.h $RPM_BUILD_ROOT/usr/include/cdrecord -cp -a libscg/scg $RPM_BUILD_ROOT/usr/include/cdrecord -cp -a xconfig.h $RPM_BUILD_ROOT/usr/include/cdrecord +mkdir -p $RPM_BUILD_ROOT/usr/include/wodim +cp -a include/*.h $RPM_BUILD_ROOT/usr/include/wodim +cp -a libscg/*.h $RPM_BUILD_ROOT/usr/include/wodim +cp -a libscg/scg $RPM_BUILD_ROOT/usr/include/wodim +cp -a xconfig.h $RPM_BUILD_ROOT/usr/include/wodim install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/bin/geteltorito cp %{S:4} . cp %{S:5} . @@ -175,7 +175,6 @@ #%doc %{_mandir}/man1/scgcheck.1.gz %verify(not mode) %attr(755,root,root) /usr/bin/wodim /usr/bin/cdrecord -#%verify(not mode) %attr(755,root,root) /usr/bin/cdrecord-dvd /usr/bin/readcd #/usr/bin/scgcheck /usr/bin/cdinfo @@ -184,7 +183,7 @@ %files devel %defattr(-, root, root) -/usr/include/cdrecord +/usr/include/wodim /usr/%{_lib}/lib*.a %files -n mkisofs @@ -221,6 +220,8 @@ /usr/bin/list_audio_tracks %changelog -n wodim +* Fri Oct 06 2006 - nadvornik@suse.cz +- moved include files to /usr/include/wodim * Tue Oct 03 2006 - nadvornik@suse.cz - removed incorrect check for grown files [#207619] - build with -DCLONE_WRITE [#209434] ++++++ cdrkit-1.0pre5.tar.gz ++++++ ++++ 7377 lines of diff (skipped) ++++++ cdrkit-dvd-fix.patch ++++++ --- /var/tmp/diff_new_pack.hulmGd/_old 2006-10-06 19:28:31.000000000 +0200 +++ /var/tmp/diff_new_pack.hulmGd/_new 2006-10-06 19:28:31.000000000 +0200 @@ -36,15 +36,15 @@ - return ret; + return -1; } - addr[0] = 0; // "Reserved" - addr[1] = 2; // "IMMED" flag + addr[0] = 0; /* "Reserved" */ + addr[1] = 2; /* "IMMED" flag */ --- libscg/scsitransp.c +++ libscg/scsitransp.c -@@ -1252,7 +1252,6 @@ +@@ -1273,7 +1273,6 @@ if(!scg_cmd_err(scgp)) return (0); - if (cp->sense.code >= 0x70) - return &(cp->sense); + return (Uchar*) &(cp->sense); } ++++++ cdrkit-perms.patch ++++++ --- /var/tmp/diff_new_pack.hulmGd/_old 2006-10-06 19:28:31.000000000 +0200 +++ /var/tmp/diff_new_pack.hulmGd/_new 2006-10-06 19:28:31.000000000 +0200 @@ -1,6 +1,6 @@ --- libscg/scsi-linux-ata.c +++ libscg/scsi-linux-ata.c -@@ -352,7 +352,7 @@ +@@ -363,7 +363,7 @@ } if (!DEVFS) { /* for /dev/sr0 - /dev/sr? */ @@ -9,7 +9,7 @@ sprintf(device, "/dev/sr%i", i); if ((f = open(device, O_RDONLY | O_NONBLOCK)) < 0) { if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) { -@@ -362,8 +362,6 @@ +@@ -373,8 +373,6 @@ device, f, errno); } return (-2); @@ -18,7 +18,7 @@ } } else { if (sg_amapdev(scgp, f, device, &schilly_bus, &target, &lun)) { -@@ -385,8 +383,6 @@ +@@ -396,8 +394,6 @@ device, f, errno); } return (-2); @@ -27,23 +27,3 @@ } } else { /* ugly hack, make better, when you can. Alex */ ---- libscg/scsi-linux-sg.c -+++ libscg/scsi-linux-sg.c -@@ -454,7 +454,7 @@ - if (scgp->errstr) - js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, - "Cannot open '/dev/sg*'"); -- if (errno != ENOENT && errno != ENXIO && errno != ENODEV) { -+ if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) { - if (scgp->errstr) - js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, - "Cannot open '%s'", devname); -@@ -502,7 +502,7 @@ - if (scgp->errstr) - js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, - "Cannot open '/dev/sg*'"); -- if (errno != ENOENT && errno != ENXIO && errno != ENODEV) { -+ if (errno != ENOENT && errno != ENXIO && errno != ENODEV && errno != EACCES) { - if (scgp->errstr) - js_snprintf(scgp->errstr, SCSI_ERRSTR_SIZE, - "Cannot open '%s'", devname); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org