Hello community,
here is the log from the commit of package wodim
checked in at Thu Nov 16 14:34:18 CET 2006.
--------
--- wodim/wodim.changes 2006-10-06 14:06:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2006-11-16 14:16:40.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 16 14:12:47 CET 2006 - nadvornik@suse.cz
+
+- adjusted version strings of subpackages [#215621]
+- changed location of config file [#221679]
+
+-------------------------------------------------------------------
New:
----
cdrkit-config-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wodim.spec ++++++
--- /var/tmp/diff_new_pack.FO2hJc/_old 2006-11-16 14:31:58.000000000 +0100
+++ /var/tmp/diff_new_pack.FO2hJc/_new 2006-11-16 14:31:58.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package wodim (Version 1.0pre5)
+# spec file for package wodim (Version 1.0pre5cvs)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,15 +12,16 @@
Name: wodim
BuildRequires: cmake file-devel gcc-c++ libcap-devel libstdc++-devel resmgr
-License: GPL, Other License(s), see package
+License: GNU General Public License (GPL), Other License(s), see package
Group: Productivity/Multimedia/CD/Record
PreReq: permissions
Autoreqprov: on
Provides: cdrecord
Obsoletes: cdrecord
-Version: 1.0pre5
-Release: 5
-Source: cdrkit-%{version}.tar.gz
+Version: 1.0pre5cvs
+Release: 1
+%define cdrkit_version 1.0pre5
+Source: cdrkit-%{cdrkit_version}.tar.gz
Source1: scan_scsi.linux
Source2: cdinfo.c
Source3: geteltorito.pl
@@ -33,12 +34,14 @@
Patch5: cdrkit-dvd-fix.patch
Patch6: cdrkit-mkisofs-grow-check.patch
Patch7: cdrkit-clone.patch
+Patch8: cdrkit-config-path.patch
URL: http://cdrkit.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Tool for Writing CDRs
%description
-cdrecord allows you to create CDs on a CD writer.
+wodim is used to record data or audio Compact Discs on a CD-Recorder or
+to write DVD media on a DVD-Recorder.
@@ -64,6 +67,8 @@
%package -n mkisofs
Summary: A program for creating CDs in Linux
Group: Productivity/Multimedia/CD/Record
+Version: cdrkit.1.0pre5
+Release: 1
Recommends: zisofs-tools
%description -n mkisofs
@@ -86,10 +91,12 @@
%package -n cdda2wav
Summary: A CD-Audio Grabbing tool
Group: Productivity/Multimedia/CD/Grabbers
+Version: cdrkit.1.0pre5
+Release: 1
%description -n cdda2wav
The common CD-audio grabbing tool for Linux. The sources are now
-contained in the cdrecord source archive.
+contained in the wodim source archive.
@@ -98,7 +105,7 @@
Heiko
%prep
-%setup -q -n cdrkit-%{version}
+%setup -q -n cdrkit-%{cdrkit_version}
%patch1
%patch2
%patch3
@@ -106,6 +113,7 @@
%patch5
%patch6
%patch7
+%patch8 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -220,6 +228,9 @@
/usr/bin/list_audio_tracks
%changelog -n wodim
+* Thu Nov 16 2006 - nadvornik@suse.cz
+- adjusted version strings of subpackages [#215621]
+- changed location of config file [#221679]
* Fri Oct 06 2006 - nadvornik@suse.cz
- moved include files to /usr/include/wodim
* Tue Oct 03 2006 - nadvornik@suse.cz
@@ -280,8 +291,8 @@
- fixed return value from fixate_mdvd
* Mon Mar 08 2004 - nadvornik@suse.cz
- updated to 2.01a27
-- chrp-boot patch is integrated in mainstream
-- TAO mode should be explicitely specified by -tao
+ - chrp-boot patch is integrated in mainstream
+ - TAO mode should be explicitely specified by -tao
* Thu Feb 12 2004 - axboe@suse.de
- Kill silly Joerg warnings
- Add note about ATA being preferred over ATAPI
@@ -329,18 +340,18 @@
- mkisofs requires zisofs-tools
* Tue Sep 24 2002 - nadvornik@suse.cz
- updated to 1.11a34
-- a bug with cdrecord -fix has been fixed [#19853]
-- improved man page
-- other fixes and improvements
+ - a bug with cdrecord -fix has been fixed [#19853]
+ - improved man page
+ - other fixes and improvements
- added zisofs-tools for transparent compression
* Tue Sep 03 2002 - nadvornik@suse.cz
- added patch for format string security problem [#18756]
* Wed Jul 31 2002 - nadvornik@suse.cz
- updated to 1.11a28
-- cdrecord now writes MCN/ISRC even in RAW mode
+ - cdrecord now writes MCN/ISRC even in RAW mode
* Fri Jul 26 2002 - nadvornik@suse.cz
- updated to 1.11a27:
-- DVD-Video support
+ - DVD-Video support
* Wed Jul 10 2002 - meissner@suse.de
- add RULES link for ppc64, s390x.
* Tue May 14 2002 - ro@suse.de
@@ -353,11 +364,11 @@
- fixed "#!/bin/sh" line in cdda2mp3.new
* Mon Jan 21 2002 - nadvornik@suse.cz
- updated to 1.11a13:
-- new script inf2cdtext.pl for creating CD-text data
+ - new script inf2cdtext.pl for creating CD-text data
* Fri Dec 07 2001 - nadvornik@suse.cz
- updated to 1.11a12:
-- readcd: changed handling of Table of contents
-- mkisofs: first UDF support
+ - readcd: changed handling of Table of contents
+ - mkisofs: first UDF support
* Tue Oct 30 2001 - uli@suse.de
- added patch from zisofs-tools allowing for creation of compressed
ISO filesystems
++++++ cdrkit-config-path.patch ++++++
--- cdrkit-1.0pre5/cdrecord/defaults.c
+++ cdrkit-1.0pre5/cdrecord/defaults.c
@@ -65,7 +65,7 @@
* don't contribute work and don't give support, they are causing extra
* work for me and this way slow down the cdrecord development.
*/
- return (defltopen("/etc/default/wodim"));
+ return (defltopen("/etc/wodim.conf"));
}
EXPORT void
--- cdrkit-1.0pre5/cdrecord/defaults.h
+++ cdrkit-1.0pre5/cdrecord/defaults.h
@@ -12,7 +12,7 @@
/* @(#)defaults.h 1.1 04/02/22 Copyright 1998-2004 J. Schilling */
/*
- * The cdrecord defaults (/etc/default/wodim) interface
+ * The cdrecord defaults (/etc/wodim.conf) interface
*
* Copyright (c) 1998-2004 J. Schilling
*/
--- cdrkit-1.0pre5/cdrecord/wodim.1
+++ cdrkit-1.0pre5/cdrecord/wodim.1
@@ -165,7 +165,7 @@
described below.
.PP
-If a file /etc/default/wodim exists, the parameter to the
+If a file /etc/wodim.conf exists, the parameter to the
.B dev=
option may also be a drive name label in said file (see FILES section).
@@ -575,13 +575,13 @@
option is present,
.B wodim
will try to get a drive specific speed value from the file
-.B /etc/default/wodim
+.B /etc/wodim.conf
and if it cannot find one, it will try to get the speed value from the
.B CDR_SPEED
environment and later from the
.B CDR_SPEED=
entry in
-.BR /etc/default/wodim .
+.BR /etc/wodim.conf .
If no speed value could be found, wodim uses a drive specific default speed.
The default for all new (MMC compliant) drives is to use the maximum supported by the drive.
If you use
@@ -785,7 +785,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.TP
.BI gracetime= #
Set the grace time before starting to write to
@@ -1968,7 +1968,7 @@
.TP
.B CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim.
+call of the SCSI transport library or a label in the file /etc/wodim.conf.
.TP
.B CDR_SPEED
Sets the default speed value for writing (see also
@@ -2031,8 +2031,8 @@
.SH FILES
.TP
-/etc/default/wodim
-Default values can be set for the following options in /etc/default/wodim.
+/etc/wodim.conf
+Default values can be set for the following options in /etc/wodim.conf.
For example:
.SM CDR_FIFOSIZE=8m
or
@@ -2041,7 +2041,7 @@
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim
+call of the SCSI transport library or a label in the file /etc/wodim.conf
that allows to identify a specific drive on the system.
.TP
CDR_SPEED
--- cdrkit-1.0pre5/cdrecord/wodim.dfl
+++ cdrkit-1.0pre5/cdrecord/wodim.dfl
@@ -1,6 +1,6 @@
#ident @(#)wodim.dfl 1.5 06/22/06 Copyr 2006 E. Bloch
#
-# This file is /etc/default/wodim
+# This file is /etc/wodim.conf
#
#ident @(#)cdrecord.dfl 1.5 05/08/09 Copyr 1998 J. Schilling
#
@@ -19,7 +19,7 @@
# Note that newer cdrecord versions do not default
# to speed=1. For MMC compliant drives, the default
# is to write at maximum speed, so it in general does
-# not make sense to set up a default speed in /etc/default/wodim
+# not make sense to set up a default speed in /etc/wodim.conf
#
#CDR_SPEED=40
--- cdrkit-1.0pre5/doc/ANNOUNCEMENTs/AN-2.01
+++ cdrkit-1.0pre5/doc/ANNOUNCEMENTs/AN-2.01
@@ -461,7 +461,7 @@
- Workaround for missing struct sockaddr_storage on SCO UnixWare
- Security update. Forbid to write arbitrary debug files, only allow
- a debug file name that has been configured in /etc/default/rscsi.
+ a debug file name that has been configured in /etc/rscsi.conf.
Writing arbitrary files with a siud root program could be used to become
root on a local machine if you are already logged into that local machine.
--- cdrkit-1.0pre5/doc/READMEs/README.ATAPI
+++ cdrkit-1.0pre5/doc/READMEs/README.ATAPI
@@ -489,14 +489,14 @@
ln -s scd1 cdrw # NOTE: see above, maybe cdrom
Check the new SCSI settings:
wodim -scanbus
- Setup wodim's environment - edit /etc/default/wodim:
+ Setup wodim's environment - edit /etc/wodim.conf:
CDR_DEVICE=cdrw
cdrw=1,0,0 4 8m
cdrom=1,2,0 0 0m
Input the right values, the fields are described in the manpage
of wodim. Alternatively, you may use this values as
wodim-parameter or take a frontend with an own configuration
- scheme, then you don't need to modify /etc/default/wodim.
+ scheme, then you don't need to modify /etc/wodim.conf.
9. It's done! Insert a CD and try "wodim -v -toc"
/*--------------------------------------------------------------------------*/
He had constant buffer underrun problems:
--- cdrkit-1.0pre5/doc/READMEs/README.rscsi
+++ cdrkit-1.0pre5/doc/READMEs/README.rscsi
@@ -32,23 +32,23 @@
- Install rscsi suid root into /opt/schily/sbin
- - Install a file /etc/default/rscsi and define access rights.
+ - Install a file /etc/rscsi.conf and define access rights.
Without this file, rscsi will not work at all.
The template for this file is: rscsi/rscsi.dfl
RSCSI Security:
-- When rscsi starts, it checks if /etc/default/rscsi exists.
+- When rscsi starts, it checks if /etc/rscsi.conf exists.
If not, it dies.
-- If rscsi is not called by a user listed in /etc/default/rscsi
+- If rscsi is not called by a user listed in /etc/rscsi.conf
it dies.
- To access a SCSI target there must be an entry that lists the user
rcsi hast been started from, the hostname and the SCSI target.
- rscsi compares the hostname field in /etc/default/rscsi
+ rscsi compares the hostname field in /etc/rscsi.conf
to the peername retrived from STDIN:
- legal host name IP connection
--- cdrkit-1.0pre5/doc/plattforms/README.linux
+++ cdrkit-1.0pre5/doc/plattforms/README.linux
@@ -159,7 +159,7 @@
If dev=0,0,0 does not work but -dev=0,0,0 works you found this
incompatibility. This problem is caused by an incompatibility
in ctype.h and it seems that there are other compatibility problems
- e.g. with reading /etc/default/wodim.
+ e.g. with reading /etc/wodim.conf.
You cannot copy binaries between different Linux versions,
always compile the sources by yourself.
--- cdrkit-1.0pre5/mkisofs/diag/isoinfo.8
+++ cdrkit-1.0pre5/mkisofs/diag/isoinfo.8
@@ -177,7 +177,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.sp
The options
.B \-i
@@ -276,7 +276,7 @@
.TP
.B CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim.
+call of the SCSI transport library or a label in the file /etc/wodim.conf.
.TP
.B RSH
If the
@@ -314,13 +314,13 @@
.SH FILES
.TP
-/etc/default/wodim
-Default values can be set for the following options in /etc/default/wodim.
+/etc/wodim.conf
+Default values can be set for the following options in /etc/wodim.conf.
.RS
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
-call of the SCSI transport library or a label in the file /etc/default/wodim
+call of the SCSI transport library or a label in the file /etc/wodim.conf
that allows to identify a specific drive on the system.
.TP
Any other label
--- cdrkit-1.0pre5/readcd/readcd.1
+++ cdrkit-1.0pre5/readcd/readcd.1
@@ -98,7 +98,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.TP
.BI timeout= #
Set the default SCSI command timeout value to
--- cdrkit-1.0pre5/rscsi/rscsi.c
+++ cdrkit-1.0pre5/rscsi/rscsi.c
@@ -154,9 +154,9 @@
* don't contribute work and don't give support, they are causing extra
* work for me and this way slow down the development.
*/
- if (defltopen("/etc/default/rscsi") < 0) {
+ if (defltopen("/etc/rscsi.conf") < 0) {
rscsierror(geterrno(), errmsgstr(geterrno()),
- "Remote configuration error: Cannot open /etc/default/rscsi");
+ "Remote configuration error: Cannot open /etc/rscsi.conf");
/* rscsirespond(-1, geterrno());*/
exit(EX_BAD);
}
@@ -177,7 +177,7 @@
/*
* XXX If someone sets up debugging and allows the debug file to be
* XXX replaced by a symlink to e.g. /etc/passwd this would be a
- * XXX security risk. But /etc/default/rscsi is only writable by root
+ * XXX security risk. But /etc/rscsi.conf is only writable by root
* XXX and for this reason a possible security risk would have been
* XXX introduced by the administrator.
*/
--- cdrkit-1.0pre5/rscsi/rscsi.dfl
+++ cdrkit-1.0pre5/rscsi/rscsi.dfl
@@ -1,6 +1,6 @@
#ident @(#)rscsi.dfl 1.3 05/08/09 Copyr 2000 J. Schilling
#
-# This file is /etc/default/rscsi
+# This file is /etc/rscsi.conf
#
# NOTE: If this file is not present, rscsi will reject to work.
#
--- cdrkit-1.0pre5/scgcheck/scgcheck.1
+++ cdrkit-1.0pre5/scgcheck/scgcheck.1
@@ -168,7 +168,7 @@
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file
-/etc/default/wodim (see FILES section).
+/etc/wodim.conf (see FILES section).
.TP
.BI timeout= #
Set the default SCSI command timeout value to
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org