Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit cdrdao
  • From: root@xxxxxxx (h_root)
  • Date: Fri, 6 Oct 2006 17:22:27 +0200 (CEST)
  • Message-id: <20061006152227.7992D19A9FF@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package cdrdao
checked in at Fri Oct 6 17:22:27 CEST 2006.

--------
--- cdrdao/cdrdao.changes 2006-02-19 17:53:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/cdrdao/cdrdao.changes 2006-10-05 17:57:17.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct 5 17:56:01 CEST 2006 - nadvornik@xxxxxxx
+
+- update to 1.2.2:
+ * bugfixes, compilation fixes
+ * updaed driver table
+- dropped unneeded patches, including resmgr patch
+
+-------------------------------------------------------------------

Old:
----
cdrdao-1.2.0-assert.patch
cdrdao-1.2.0-config-cleanup.patch
cdrdao-1.2.0-config-fix.patch
cdrdao-1.2.0-scan.patch
cdrdao-1.2.0.tar.bz2
cdrdao.drivers
ia64.dif
resmgr.dif
s390.dif

New:
----
cdrdao-1.2.2-scan.patch
cdrdao-1.2.2.tar.bz2

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

Other differences:
------------------
++++++ cdrdao.spec ++++++
--- /var/tmp/diff_new_pack.as3bS6/_old 2006-10-06 17:21:41.000000000 +0200
+++ /var/tmp/diff_new_pack.as3bS6/_new 2006-10-06 17:21:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cdrdao (Version 1.2.0)
+# spec file for package cdrdao (Version 1.2.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,24 +11,17 @@
# norootforbuild

Name: cdrdao
-BuildRequires: cdrecord-devel gcc-c++ libao-devel libgnomeuimm-devel libvorbis-devel update-desktop-files
+BuildRequires: gcc-c++ libao-devel libgnomeuimm-devel libvorbis-devel update-desktop-files wodim-devel
License: GPL
Group: Productivity/Multimedia/CD/Record
Autoreqprov: on
-Version: 1.2.0
-Release: 6
+Version: 1.2.2
+Release: 1
Summary: Write CD-Rs in Disk-At-Once Mode
URL: http://cdrdao.sourceforge.net
-Source: cdrdao-1.2.0.tar.bz2
-Source1: cdrdao.drivers
-Patch1: ia64.dif
-Patch2: s390.dif
-Patch3: resmgr.dif
-Patch7: cdrdao-%{version}-assert.patch
-Patch10: cdrdao-%{version}-config-cleanup.patch
-Patch12: cdrdao-build.patch
-Patch13: cdrdao-%{version}-config-fix.patch
-Patch14: cdrdao-%{version}-scan.patch
+Source: cdrdao-%{version}.tar.bz2
+Patch1: cdrdao-build.patch
+Patch2: cdrdao-%{version}-scan.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -60,28 +53,18 @@

%prep
%setup -q
-cp %{S:1} dao/cdrdao.drivers
%patch1
%patch2
-%patch3 -p1 -b .resmgr
-%patch7
-%patch10
-%patch12
-%patch13
-%patch14

%build
-%{suse_update_config -f paranoia scsilib/conf}
autoreconf -f -i
-ln -sf i586-linux-cc.rul scsilib/RULES/x86_64-linux-cc.rul
-ln -sf ppc-linux-cc.rul scsilib/RULES/ppc64-linux-cc.rul
-ln -sf s390-linux-cc.rul scsilib/RULES/s390x-linux-cc.rul
-ln -sf s390-linux-gcc.rul scsilib/RULES/s390x-linux-gcc.rul
+rm -rf scsilib # to be sure the external lib is used
export GNOME_CONFIG=/opt/gnome/bin/gnome-config
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
./configure --prefix=/usr \
- --with-scglib-inc=/usr/include/cdrecord \
+ --with-scglib=sys \
+ --with-scglib-inc=/usr/include/wodim \
--with-scglib-lib=/usr/%_lib \
--with-gnome-prefix=/opt/gnome \
--mandir=%{_mandir}
@@ -126,6 +109,11 @@
/usr/share/mime/packages/gcdmaster.xml

%changelog -n cdrdao
+* Thu Oct 05 2006 - nadvornik@xxxxxxx
+- update to 1.2.2:
+ * bugfixes, compilation fixes
+ * updaed driver table
+- dropped unneeded patches, including resmgr patch
* Sun Feb 19 2006 - aj@xxxxxxx
- Reduce BuildRequires.
* Tue Jan 31 2006 - nadvornik@xxxxxxx

++++++ cdrdao-1.2.0-scan.patch -> cdrdao-1.2.2-scan.patch ++++++

++++++ cdrdao-1.2.0.tar.bz2 -> cdrdao-1.2.2.tar.bz2 ++++++
++++ 56544 lines of diff (skipped)

++++++ cdrdao-build.patch ++++++
--- /var/tmp/diff_new_pack.as3bS6/_old 2006-10-06 17:21:45.000000000 +0200
+++ /var/tmp/diff_new_pack.as3bS6/_new 2006-10-06 17:21:45.000000000 +0200
@@ -21,26 +21,6 @@
if ( q != NULL ) t = q->token;
}
else t = q->token;
---- trackdb/Cue2Toc.cc
-+++ trackdb/Cue2Toc.cc
-@@ -236,6 +236,7 @@
- else if (strcmp(buf, "MODE2/2336") == 0) return TrackData::MODE2;
- else if (strcmp(buf, "MODE2/2352") == 0) return TrackData::MODE2_RAW;
- else err_fail("Unsupported track mode");
-+ return TrackData::AUDIO; /* not reached */
- }
-
- static void check_once(enum command cmd, char *s, enum scope sc);
---- trackdb/CueParser.cc
-+++ trackdb/CueParser.cc
-@@ -21,6 +21,7 @@
- #include <sstream>
- #include <stdio.h>
-
-+#include "Toc.h"
- #include "Cue2Toc.h"
-
- extern Toc *parseToc(const char* tocBuffer, const char *filename);
--- trackdb/FormatConverter.h
+++ trackdb/FormatConverter.h
@@ -29,7 +29,7 @@
@@ -52,70 +32,3 @@
class FormatSupport
{
public:
---- trackdb/Track.cc
-+++ trackdb/Track.cc
-@@ -411,6 +411,7 @@
- }
-
- update();
-+ return true;
- }
-
- // Sets ISRC code. Expected string: "CCOOOYYSSSSS"
-@@ -596,6 +597,7 @@
- }
- }
- }
-+ return true;
- }
-
- // Locates 'SubTrack' that contains specified sample.
---- utils/cue2toc.c
-+++ utils/cue2toc.c
-@@ -239,6 +239,7 @@
- else if (strcmp(buf, "MODE2/2336") == 0) return MODE2;
- else if (strcmp(buf, "MODE2/2352") == 0) return MODE2_RAW;
- else err_fail("Unsupported track mode");
-+ return AUDIO; /* not reached */
- }
-
- static void check_once(enum command cmd, char *s, enum scope sc);
---- xdao/ProgressDialog.h
-+++ xdao/ProgressDialog.h
-@@ -62,7 +62,7 @@
- bool leadTimeFilled_;
-
- struct timeval time_;
-- bool ProgressDialog::time();
-+ bool time();
-
- Gtk::Button *cancelButton_;
- Gtk::Button *closeButton_;
---- xdao/TocEdit.cc
-+++ xdao/TocEdit.cc
-@@ -738,6 +738,7 @@
- }
- return true;
- }
-+ return true;
- }
-
- int TocEdit::appendSilence(unsigned long length)
---- xdao/TocEditView.cc
-+++ xdao/TocEditView.cc
-@@ -103,6 +103,7 @@
- sampleSelectionValid_ = false;
- return true;
- }
-+ return false;
- }
-
- bool TocEditView::sampleSelection(unsigned long *smin,
-@@ -125,6 +126,7 @@
- //llanero: different views
- // tocEdit_->updateLevel_ |= UPD_SAMPLES;
- }
-+ return false;
- }
-
- void TocEditView::sampleView(unsigned long *smin, unsigned long *smax) const


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



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