Hello community, here is the log from the commit of package cdrdao for openSUSE:Factory checked in at Mon Sep 5 16:25:15 CEST 2011.
-------- --- cdrdao/cdrdao.changes 2010-10-31 19:03:06.000000000 +0100 +++ cdrdao/cdrdao.changes 2011-09-03 22:07:32.000000000 +0200 @@ -1,0 +2,42 @@ +Sat Sep 3 19:41:50 UTC 2011 - [email protected] + +- update to 1.2.3: + * By default, cdrdao tries to build with a native SCSI interface. + * Complete rewrite of native Linux SG driver. + * Added support for new FIRST_TRACK_NO keyword to allow a CD to start with a + track number other than 1. + * Added native interfaces for Irix, Mac OSX and NetBSD. + * Fixed old pregap length off-by-one error, see bug #604751. + * Fixed bug in Toc file parser track length computation. + * Man page typo fixes. + * Cygwin compilation fixes. Other various compilation warning fixes. + * Some scsilib fixes for FreeBSD, 32-bit and 64-bit SPARC. + * Some makefile changes to avoid conflict with installed system libs. + * Added patch to fix ARM and MIPS scsilib compile. + * Added man pages for toc2cue and toc2cddb, from Debian. + * Move privilege drop earlier in main flow. + * Commited Gentoo patch for CD-TEXT track check fix. + GCDMaster changes: + * Preferences now stored in GConf, exports schema file. + * Added simple Preferences dialog to change temporary file directory. + * Fixed GCC 4.3 compilation issues. +- Spec file updates: + * Changed License: to GPL-2.0+. + * Added description for the patches based on openSUSE Patches Guidelines. + * Added gtkmm2-devel, libsigc++2-devel, pkg-config in BuildRequires:. + * Removed wodim-devel from BuildRequires: (the package now uses a native SCSI + interface). + * Added mimeinfo scriptlet for the mime file installed by the package. + * Minor other updates. +- Rebased cdrdao-build.patch, cdrdao-1.2.2-scan.patch and cdrdao-fixes.patch to + apply cleanly. +- Removed cdrdao-1.2.2-include.patch, cdrdao-1.2.2-sigc.patch and + cdrdao-1.2.2-libnsl.patch (fixed upstream). +- Removed cdrdao-1.2.2-usal.patch (the package now uses a native SCSI + interface). +- Added cdrdao-1.2.3-stat.patch (taken from Fedora) to fix missing includes + that cause failure build. +- Added cdrdao-1.2.2-desktop.patch (taken from Fedora) to make the desktop file + XDG compatible and add MimeType entries. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cdrdao-1.2.2-include.patch cdrdao-1.2.2-libnsl.patch cdrdao-1.2.2-sigc.patch cdrdao-1.2.2-usal.patch cdrdao-1.2.2.tar.bz2 New: ---- cdrdao-1.2.2-desktop.patch cdrdao-1.2.3-stat.patch cdrdao-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdrdao.spec ++++++ --- /var/tmp/diff_new_pack.96nUYH/_old 2011-09-05 16:21:44.000000000 +0200 +++ /var/tmp/diff_new_pack.96nUYH/_new 2011-09-05 16:21:44.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package cdrdao (Version 1.2.2) +# spec file for package cdrdao # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,40 @@ # norootforbuild +%define DISTRIBUTABLE 1 Name: cdrdao -%define DISTRIBUTABLE 1 -BuildRequires: gcc-c++ libao-devel libgnomeuimm-devel libvorbis-devel update-desktop-files wodim-devel +Version: 1.2.3 +Release: 1 +License: GPL-2.0+ +Summary: Write CD-Rs in Disk-At-Once Mode +Url: http://cdrdao.sourceforge.net/ +Group: Productivity/Multimedia/CD/Record +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE cdrdao-build.patch +Patch0: cdrdao-build.patch +# PATCH-FIX-OPENSUSE cdrdao-1.2.2-scan.patch bnc#144861 [email protected] -- Do not scan old ATAPI interface +Patch1: cdrdao-1.2.2-scan.patch +# PATCH-FIX-OPENSUSE cdrdao-fixes.patch bnc#424635 [email protected] -- Fix cdrdao segfault +Patch2: cdrdao-fixes.patch +# PATCH-FIX-OPENSUSE cdrdao-1.2.3-stat.patch [email protected] -- Missing includes causes failure build (patch taken from Fedora) +Patch3: cdrdao-1.2.3-stat.patch +# PATCH-FIX-OPENSUSE cdrdao-1.2.2-desktop.patch [email protected] -- Make the desktop file XDG compatible, add MimeType entries (patch taken from Fedora) +Patch4: cdrdao-1.2.2-desktop.patch +BuildRequires: gcc-c++ +BuildRequires: gtkmm2-devel +BuildRequires: libao-devel +BuildRequires: libgnomeuimm-devel +BuildRequires: libsigc++2-devel +BuildRequires: libvorbis-devel +BuildRequires: pkg-config +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif %if %DISTRIBUTABLE == 0 -BuildRequires: lame mad-devel +BuildRequires: lame +BuildRequires: mad-devel %endif -License: GPLv2+ -Group: Productivity/Multimedia/CD/Record -AutoReqProv: on -Version: 1.2.2 -Release: 317 -Summary: Write CD-Rs in Disk-At-Once Mode -Url: http://cdrdao.sourceforge.net -Source: cdrdao-%{version}.tar.bz2 -Patch1: cdrdao-build.patch -Patch2: cdrdao-%{version}-scan.patch -Patch3: cdrdao-%{version}-usal.patch -Patch4: cdrdao-%{version}-include.patch -Patch5: cdrdao-%{version}-sigc.patch -Patch6: cdrdao-%{version}-libnsl.patch -Patch7: cdrdao-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,17 +60,14 @@ contain nonzero audio data. This is useful for dividing live recordings into tracks where 2 second gaps would be irritating. - - -Authors: --------- - Andreas Mueller <[email protected]> - %package -n gcdmaster -License: GPLv2+ -Requires: cdrdao +License: GPL-2.0+ Summary: Graphical front end to cdrdao for composing audio CDs Group: Productivity/Multimedia/CD/Record +Requires: cdrdao +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +%gconf_schemas_requires %description -n gcdmaster gcdmaster allows the creation of toc-files for cdrdao and can control @@ -67,60 +76,68 @@ of meta data like ISRC codes/CD-TEXT and nondestructive cut of the audio data. - - %prep %setup -q +%patch0 %patch1 %patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 +%patch3 -p1 +%patch4 -p1 %build -autoreconf -f -i -rm -r scsilib # to be sure the external lib is used -%configure\ - --with-scglib=sys\ - --with-scglib-inc=%{_includedir}/wodim\ - --with-scglib-lib=%{_libdir} -make %{?_smp_mflags} +%configure \ + --without-scglib +make %{?_smp_mflags} VERBOSE=1 %install -%makeinstall -rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info $RPM_BUILD_ROOT%{_datadir}/application-registry -%suse_update_desktop_file gcdmaster DiscBurning +%make_install + +# Not needed +rm -rf %{buildroot}%{_datadir}/mime-info %{buildroot}%{_datadir}/application-registry + +%if 0%{?suse_version} +%suse_update_desktop_file gcdmaster -r GTK GNOME AudioVideo DiscBurning +%endif + +%find_gconf_schemas %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + +%pre -n gcdmaster -f %{name}.schemas_pre %post -n gcdmaster -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database usr/share/mime >/dev/null -fi +/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : + +%preun -n gcdmaster -f %{name}.schemas_preun %postun -n gcdmaster -if test -x usr/bin/update-mime-database ; then - usr/bin/update-mime-database usr/share/mime >/dev/null -fi +/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : + +%posttrans -n gcdmaster -f %{name}.schemas_posttrans %files -%defattr(-,root,root) -%doc README README.PlexDAE COPYING CREDITS -%{_bindir}/[ct]* -%{_datadir}/cdrdao -%doc %{_mandir}/*/cdrdao* -%doc %{_mandir}/*/cue2toc* +%defattr(-,root,root,-) +%doc AUTHORS COPYING CREDITS ChangeLog README README.PlexDAE cdrdao.lsm +%doc contrib/wav2dao/wav2dao.pl +%{_bindir}/cdrdao +%{_bindir}/cue2toc +%{_bindir}/toc2cddb +%{_bindir}/toc2cue +%{_datadir}/cdrdao/ +%doc %{_mandir}/man1/cue2toc.1%{ext_man} +%doc %{_mandir}/man1/cdrdao.1%{ext_man} +%doc %{_mandir}/man1/toc2cddb.1%{ext_man} +%doc %{_mandir}/man1/toc2cue.1%{ext_man} -%files -n gcdmaster -%defattr(-,root,root) +%files -n gcdmaster -f %{name}.schemas_list +%defattr(-,root,root,-) %{_bindir}/gcdmaster -%{_datadir}/applications/*.desktop -%{_datadir}/gcdmaster +%{_datadir}/applications/gcdmaster.desktop +%{_datadir}/gcdmaster/ %{_datadir}/mime/packages/gcdmaster.xml -%{_datadir}/pixmaps/*.png -%doc %{_mandir}/*/gcdmaster* +%{_datadir}/pixmaps/gcdmaster.png +%{_datadir}/pixmaps/gcdmaster-doc.png +%doc %{_mandir}/man1/gcdmaster.1%{ext_man} %changelog ++++++ cdrdao-1.2.2-desktop.patch ++++++ --- cdrdao-1.2.3rc2/xdao/gcdmaster.desktop~ 2004-06-28 20:05:57.000000000 +0200 +++ cdrdao-1.2.3rc2/xdao/gcdmaster.desktop 2009-04-07 09:13:56.000000000 +0200 @@ -1,10 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Gnome CD Master Comment=Gnome Audio CD editor and burner Exec=gcdmaster %F -Icon=gcdmaster.png +Icon=gcdmaster Terminal=false Type=Application StartupNotify=true -Categories=GNOME;AudioVideo;Application;X-Fedora; +Categories=GNOME;AudioVideo;X-Fedora;DiscBurning; +MimeType=application/x-toc;application/x-cue;application/x-cdrdao-toc; ++++++ cdrdao-1.2.2-scan.patch ++++++ --- /var/tmp/diff_new_pack.96nUYH/_old 2011-09-05 16:21:44.000000000 +0200 +++ /var/tmp/diff_new_pack.96nUYH/_new 2011-09-05 16:21:44.000000000 +0200 @@ -1,27 +1,27 @@ ---- dao/main.cc -+++ dao/main.cc -@@ -1829,7 +1829,9 @@ +--- dao/main.cc.orig 2009-05-04 18:49:52.000000000 +0300 ++++ dao/main.cc 2011-09-03 14:29:05.808000068 +0300 +@@ -1935,7 +1935,9 @@ sdata[i].product, sdata[i].revision); } delete[] sdata; - } else { + } -+#if 0 ++#if 0 + else { sdata = ScsiIf::scan(&len, "ATAPI"); if (sdata) { for (i = 0; i < len; i++) { -@@ -1840,6 +1842,7 @@ +@@ -1946,6 +1948,7 @@ } } #endif +#endif } - static int checkToc(const Toc *toc) ---- xdao/CdDevice.cc -+++ xdao/CdDevice.cc -@@ -1236,7 +1236,9 @@ + static int checkToc(const Toc *toc, bool force) +--- xdao/CdDevice.cc.orig 2009-02-21 15:49:17.000000000 +0200 ++++ xdao/CdDevice.cc 2011-09-03 14:29:50.643000070 +0300 +@@ -1243,7 +1243,9 @@ for (i = 0; i < len; i++) CdDevice::add(sdata[i].dev.c_str(), sdata[i].vendor, sdata[i].product); delete[] sdata; @@ -32,7 +32,7 @@ // Only scan for ATAPI devices if we got nothing on the ATA // interface, otherwise every device would show up twice on the // list. -@@ -1248,6 +1250,7 @@ +@@ -1255,6 +1257,7 @@ } } #endif ++++++ cdrdao-1.2.3-stat.patch ++++++ diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc --- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 +++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 @@ -19,6 +19,9 @@ #include <config.h> +#include <sys/types.h> +#include <sys/stat.h> + #include <stdio.h> #include <fcntl.h> #include <unistd.h> ++++++ cdrdao-1.2.2.tar.bz2 -> cdrdao-1.2.3.tar.bz2 ++++++ ++++ 21279 lines of diff (skipped) ++++++ cdrdao-build.patch ++++++ --- /var/tmp/diff_new_pack.96nUYH/_old 2011-09-05 16:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.96nUYH/_new 2011-09-05 16:21:45.000000000 +0200 @@ -1,26 +1,3 @@ ---- pccts/antlr/antlr.c -+++ pccts/antlr/antlr.c -@@ -20,7 +20,7 @@ - #include "syn.h" - #include "hash.h" - #include "generic.h" --#define zzcr_attr(attr,tok,t) -+#define zzcr_attr(attr,tok,t) {(attr)->left = 0; (attr)->right = 0;} - #define zzSET_SIZE 20 - #include "antlr.h" - #include "tokens.h" ---- pccts/antlr/bits.c -+++ pccts/antlr/bits.c -@@ -272,7 +272,8 @@ - if ( q == NULL ) - { - /* if quoted and not an expr look for eclass name */ -- q = (TermEntry *) hash_get(Tname, *((char **)&(e->elem))=StripQuotes((char *)e->elem)); -+ e->elem=(void *)StripQuotes((char *)e->elem); -+ q = (TermEntry *) hash_get(Tname, (char *) e->elem); - if ( q != NULL ) t = q->token; - } - else t = q->token; --- trackdb/FormatConverter.h +++ trackdb/FormatConverter.h @@ -29,7 +29,7 @@ ++++++ cdrdao-fixes.patch ++++++ --- /var/tmp/diff_new_pack.96nUYH/_old 2011-09-05 16:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.96nUYH/_new 2011-09-05 16:21:45.000000000 +0200 @@ -8,14 +8,3 @@ } static v_fragment *i_vfragment_constructor(void){ ---- trackdb/TrackData.cc -+++ trackdb/TrackData.cc -@@ -392,7 +392,7 @@ - // data mode - unsigned long len; - -- switch (dataFileLength(filename_, offset_, &len) != 0) { -+ switch (dataFileLength(filename_, offset_, &len)) { - case 1: - message(-2, "Track %d: Cannot open data file \"%s\": %s", trackNr, - filename_, strerror(errno)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
