Mailinglist Archive: opensuse-commit (1138 mails)

< Previous Next >
commit wodim
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 23 Jan 2007 01:35:15 +0100
  • Message-id: <20070123003515.B5498678179@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package wodim
checked in at Tue Jan 23 01:35:15 CET 2007.

--------
--- wodim/wodim.changes 2006-11-27 17:43:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2007-01-22 15:44:06.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Jan 22 15:40:42 CET 2007 - nadvornik@xxxxxxx
+
+- updated to cdrkit-1.1.2
+ * many patches merged upstream
+ * more programs was renamed:
+ mkisofs -> genisoimage
+ readcd -> readom
+ cdda2wav -> icedax
+ * 'wodim -devices' scans for all usable devices
+- subpackages renamed respectively
+- compatibility symlinks put to new cdrkit-cdrtools-compat package
+
+-------------------------------------------------------------------

Old:
----
cdrkit-1.0pre5.tar.gz
cdrkit-clone.patch
cdrkit-config-path.patch
cdrkit-gcc-workaround.patch
cdrkit-HZ.patch
cdrkit-mkisofs-fail-on-large-file.patch
cdrkit-mkisofs-grow-check.patch
cdrkit-perms.patch
geteltorito.pl
README.geteltorito

New:
----
cdrkit-1.1.2.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wodim.spec ++++++
--- /var/tmp/diff_new_pack.Cp5036/_old 2007-01-23 01:34:40.000000000 +0100
+++ /var/tmp/diff_new_pack.Cp5036/_new 2007-01-23 01:34:40.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package wodim (Version 1.0pre5cvs)
+# spec file for package wodim (Version 1.1.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,29 +12,17 @@

Name: wodim
BuildRequires: cmake file-devel gcc-c++ libcap-devel libstdc++-devel resmgr
-License: GNU General Public License (GPL), Other License(s), see package
+License: GNU General Public License (GPL)
Group: Productivity/Multimedia/CD/Record
PreReq: permissions
Autoreqprov: on
-Provides: cdrecord
-Obsoletes: cdrecord
-Version: 1.0pre5cvs
-Release: 4
-%define cdrkit_version 1.0pre5
-Source: cdrkit-%{cdrkit_version}.tar.gz
+Version: 1.1.2
+Release: 1
+Source: cdrkit-%{version}.tar.gz
Source1: scan_scsi.linux
Source2: cdinfo.c
-Source3: geteltorito.pl
-Source4: README.geteltorito
Source5: README.SUSE
-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
-Patch8: cdrkit-config-path.patch
+Patch1: cdrkit-dvd-fix.patch
URL: http://cdrkit.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Tool for Writing CDRs
@@ -47,7 +35,12 @@

Authors:
--------
- Jörg Schilling, adapted with patches from other Authors
+ Joerg Jaspert (leader, release management)
+ Eduard Bloch (developer, patch integration)
+ Steve McIntyre (developer)
+ Peter Samuelson (developer, QA)
+ Christian Fromme (QA)
+ Joerg Schilling (original cdrecord)

%package devel
Summary: Tool for writing CDRs
@@ -64,14 +57,40 @@
--------
Joerg Schilling <joerg@xxxxxxxxxxxxxxxxxxxxxxxxxxx>

-%package -n mkisofs
+%package -n cdrkit-cdrtools-compat
+Summary: Tool for Writing CDRs - cdrtools compatibility package
+Group: Productivity/Multimedia/CD/Record
+Requires: wodim genisoimage icedax
+Provides: cdrecord
+Obsoletes: cdrecord
+Provides: cdda2wav
+Obsoletes: cdda2wav
+Provides: mkisofs
+Obsoletes: mkisofs
+
+%description -n cdrkit-cdrtools-compat
+This package contains these compatibility symlinks: cdrecord -> wodim
+mkisofs -> genisoimage cdda2wav -> icedax
+
+Install this package if you can't use the cdrkit programs directly.
+
+
+
+Authors:
+--------
+ Joerg Jaspert (leader, release management)
+ Eduard Bloch (developer, patch integration)
+ Steve McIntyre (developer)
+ Peter Samuelson (developer, QA)
+ Christian Fromme (QA)
+ Joerg Schilling (original cdrecord)
+
+%package -n genisoimage
Summary: A program for creating CDs in Linux
Group: Productivity/Multimedia/CD/Record
-Version: cdrkit.1.0pre5
-Release: 4
Recommends: zisofs-tools

-%description -n mkisofs
+%description -n genisoimage
Mkisofs is a pre-mastering program that generates an iso9660 filesystem
. It takes a snapshot of a given directory tree, and generates a binary
image which corresponds to an iso9660 filesystem that can be written to
@@ -88,13 +107,11 @@
Peter van der Veen <peterv@xxxxxxx>
R.-D. Marzusch <marzusch@xxxxxxxxxxxxxxx>

-%package -n cdda2wav
+%package -n icedax
Summary: A CD-Audio Grabbing tool
Group: Productivity/Multimedia/CD/Grabbers
-Version: cdrkit.1.0pre5
-Release: 4

-%description -n cdda2wav
+%description -n icedax
The common CD-audio grabbing tool for Linux. The sources are now
contained in the wodim source archive.

@@ -105,15 +122,8 @@
Heiko <heiko@xxxxxxxxxxxxxxxxxx>

%prep
-%setup -q -n cdrkit-%{cdrkit_version}
+%setup -q -n cdrkit-%{version}
%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
-%patch7
-%patch8 -p1

%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -130,36 +140,40 @@
#mkdir patch
#mv Linux.scsi-patch patch
install -d $RPM_BUILD_ROOT/usr/bin
-install cdda2wav/readmult \
- cdda2wav/cdda2mp3 \
- cdda2wav/cdda2mp3.new \
- cdda2wav/inf2cdtext.pl \
+install icedax/readmult \
+ icedax/cdda2mp3 \
+ icedax/cdda2mp3.new \
+ icedax/inf2cdtext.pl \
%{S:1} \
cdinfo \
$RPM_BUILD_ROOT/usr/bin
#
ln -sf wodim $RPM_BUILD_ROOT/usr/bin/cdrecord
-ln -sf cdda2wav $RPM_BUILD_ROOT/usr/bin/list_audio_tracks
-mv mkisofs/diag/README mkisofs/diag/README.diag
-ln -sf isoinfo.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/devdump.8.gz
-ln -sf isoinfo.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/isovfy.8.gz
-ln -sf isoinfo.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/isodump.8.gz
+ln -sf readom $RPM_BUILD_ROOT/usr/bin/readcd
+ln -sf icedax $RPM_BUILD_ROOT/usr/bin/cdda2wav
+ln -sf genisoimage $RPM_BUILD_ROOT/usr/bin/mkisofs
+ln -sf icedax $RPM_BUILD_ROOT/usr/bin/list_audio_tracks
+#
+ln -sf wodim.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/cdrecord.1.gz
+ln -sf readom.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/readcd.1.gz
+ln -sf icedax.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/cdda2wav.1.gz
+ln -sf genisoimage.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mkisofs.1.gz
+#
+mv genisoimage/diag/README genisoimage/diag/README.diag
mkdir -p $RPM_BUILD_ROOT/usr/%_lib
-install -m 644 libdeflt/libdeflt.a \
- libhfs_iso/libhfs_iso.a \
+install -m 644 libhfs_iso/libhfs_iso.a \
libparanoia/libparanoia.a \
- libscg/libscg.a \
- libschily/libschily.a \
+ libusal/libusal.a \
+ librols/librols.a \
libunls/libunls.a \
$RPM_BUILD_ROOT/usr/%_lib
rm -rf $RPM_BUILD_ROOT/usr/include
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 libusal/*.h $RPM_BUILD_ROOT/usr/include/wodim
+cp -a libusal/usal $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} .
+install -m 755 3rd-party/geteltorito/geteltorito.pl $RPM_BUILD_ROOT/usr/bin/geteltorito
cp %{S:5} .
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/cdda2ogg.1
rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/make*
@@ -178,31 +192,50 @@

%files
%defattr(-, root, root)
-%doc ABOUT INSTALL Changelog COPYING START TODO FORK cdrecord/LICENSE
+%doc ABOUT INSTALL Changelog COPYING START TODO FORK
%doc doc/ANNOUNCEMENTs doc/READMEs
#%doc %{_mandir}/man1/cdrecord.1.gz
%doc %{_mandir}/man1/wodim.1.gz
-%doc %{_mandir}/man1/readcd.1.gz
+#%doc %{_mandir}/man1/readcd.1.gz
+%doc %{_mandir}/man1/readom.1.gz
#%doc %{_mandir}/man1/scgcheck.1.gz
%verify(not mode) %attr(755,root,root) /usr/bin/wodim
-/usr/bin/cdrecord
-/usr/bin/readcd
+/usr/bin/readom
#/usr/bin/scgcheck
/usr/bin/cdinfo
#/usr/bin/skel
-%attr(0555,root,root)/usr/sbin/rscsi
+#%attr(0555,root,root)/usr/sbin/rscsi
+%attr(0555,root,root)/usr/sbin/netscsid

%files devel
%defattr(-, root, root)
/usr/include/wodim
/usr/%{_lib}/lib*.a

-%files -n mkisofs
+%files -n cdrkit-cdrtools-compat
%defattr(-, root, root)
-%doc doc/mkisofs/*
-%doc %{_mandir}/man8/*
-%doc %{_mandir}/man1/dirsplit.1.gz
+#compatibilty symlinks:
/usr/bin/mkisofs
+/usr/bin/cdda2wav
+/usr/bin/cdrecord
+/usr/bin/readcd
+%doc %{_mandir}/man1/cdrecord.1.gz
+%doc %{_mandir}/man1/readcd.1.gz
+%doc %{_mandir}/man1/cdda2wav.1.gz
+%doc %{_mandir}/man1/mkisofs.1.gz
+
+%files -n genisoimage
+%defattr(-, root, root)
+%doc doc/genisoimage/* 3rd-party/geteltorito/README.geteltorito
+%doc %{_mandir}/man1/devdump.1.gz
+%doc %{_mandir}/man1/dirsplit.1.gz
+%doc %{_mandir}/man1/genisoimage.1.gz
+%doc %{_mandir}/man1/isodebug.1.gz
+%doc %{_mandir}/man1/isodump.1.gz
+%doc %{_mandir}/man1/isoinfo.1.gz
+%doc %{_mandir}/man1/isovfy.1.gz
+%doc %{_mandir}/man5/genisoimagerc.5.gz
+/usr/bin/genisoimage
#/usr/bin/mkhybrid
/usr/bin/isoinfo
/usr/bin/devdump
@@ -213,10 +246,11 @@
/usr/bin/dirsplit
/usr/bin/geteltorito

-%files -n cdda2wav
+%files -n icedax
%defattr(-, root, root)
-%doc doc/cdda2wav/*
-%doc %{_mandir}/man1/cdda2wav.1.gz
+%doc doc/icedax/*
+#%doc %{_mandir}/man1/cdda2wav.1.gz
+%doc %{_mandir}/man1/icedax.1.gz
%doc %{_mandir}/man1/pitchplay.1.gz
%doc %{_mandir}/man1/readmult.1.gz
%doc %{_mandir}/man1/list_audio_tracks.1.gz
@@ -226,11 +260,21 @@
/usr/bin/cdda2mp3
/usr/bin/cdda2ogg
/usr/bin/cdda2mp3.new
-/usr/bin/cdda2wav
+/usr/bin/icedax
/usr/bin/inf2cdtext.pl
/usr/bin/list_audio_tracks

%changelog -n wodim
+* Mon Jan 22 2007 - nadvornik@xxxxxxx
+- updated to cdrkit-1.1.2
+ * many patches merged upstream
+ * more programs was renamed:
+ mkisofs -> genisoimage
+ readcd -> readom
+ cdda2wav -> icedax
+ * 'wodim -devices' scans for all usable devices
+- subpackages renamed respectively
+- compatibility symlinks put to new cdrkit-cdrtools-compat package
* Mon Nov 27 2006 - nadvornik@xxxxxxx
- copy cdrecord config file on update [#221679]
* Thu Nov 16 2006 - nadvornik@xxxxxxx


++++++ cdrkit-1.0pre5.tar.gz -> cdrkit-1.1.2.tar.gz ++++++
++++ 305261 lines of diff (skipped)

++++++ cdrkit-dvd-fix.patch ++++++
--- /var/tmp/diff_new_pack.Cp5036/_old 2007-01-23 01:34:44.000000000 +0100
+++ /var/tmp/diff_new_pack.Cp5036/_new 2007-01-23 01:34:44.000000000 +0100
@@ -1,50 +1,10 @@
---- cdrecord/drv_mmc.c
-+++ cdrecord/drv_mmc.c
-@@ -2762,6 +2762,7 @@
- cdr_t *dp;
- track_t *trackp;
- {
-+ int ret;
- /*set a really BIG timeout and call fixate_mmc
- The BIG timeout is needed in case there was a very short rzone to write at the
- beginning of the disk, because lead-out needs to be at some distance.
-@@ -2771,13 +2772,13 @@
- if(is_packet(trackp) || dp->profile == 0x1B){
- scsi_close_tr_session(scgp, CL_TYPE_SESSION, 0, FALSE);
- }
-- fixate_mmc(scgp, dp, trackp);
-+ ret = fixate_mmc(scgp, dp, trackp);
- if (dp->profile == 0x2B) {
- scsi_close_tr_session(scgp, CL_TYPE_OPEN_SESSION, 0, FALSE);
- scsi_close_tr_session(scgp, CL_TYPE_FINALISE_MINRAD, 0, FALSE);
- }
- scg_settimeout(scgp, 200);
--
-+ return ret;
- }
-
- char *blank_types[] = {
-@@ -2860,11 +2861,11 @@
- printf("format_mdvd: media is a DVD+RW.\n");
- dip = (struct disk_info *)buf;
- if (get_diskinfo(scgp, dip) < 0)
-- return ret;
-+ return -1;
-
- if (dip->disk_status & 3 && formattype != FORCE_FORMAT) {
- printf("Error: disk already formated, ignoring.\n");
-- return ret;
-+ return -1;
- }
- addr[0] = 0; /* "Reserved" */
- addr[1] = 2; /* "IMMED" flag */
---- libscg/scsitransp.c
-+++ libscg/scsitransp.c
-@@ -1273,7 +1273,6 @@
- if(!scg_cmd_err(scgp))
+--- libusal/scsitransp.c
++++ libusal/scsitransp.c
+@@ -1153,7 +1153,6 @@
+ if(!usal_cmd_err(usalp))
return (0);

- if (cp->sense.code >= 0x70)
- return (Uchar*) &(cp->sense);
+ return (char *) &(cp->sense);
}


++++++ README.SUSE ++++++
--- wodim/README.SUSE 2006-02-02 14:22:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/wodim/README.SUSE 2007-01-17 16:08:25.000000000 +0100
@@ -5,15 +5,16 @@
the only supported interface is the new ATA interface. Therefore
the recommended way of running cdrecord is:

-cdrecord dev=/dev/cdrecorder
+wodim dev=/dev/cdrecorder

-or
+and for scanning devices:

-cdrecord dev=ATA:x,y,z
+wodim -devices

-and for scanning devices:

-cdrecord dev=ATA -scanbus
+The original way of specifying the device with dev=x,y,z or dev=ATA:x,y,z
+and scanning devices with cdrecord -scanbus is kept only for compatibility
+with cdrecord.

Please don't use ide-scsi or dev=ATAPI. These kernel interfaces
are obsolete and unmaintained.



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages