Hello community, here is the log from the commit of package cdrdao for openSUSE:Factory checked in at 2019-09-20 14:44:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdrdao (Old) and /work/SRC/openSUSE:Factory/.cdrdao.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdrdao" Fri Sep 20 14:44:10 2019 rev:29 rq:729449 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cdrdao/cdrdao.changes 2019-06-05 11:37:54.343088087 +0200 +++ /work/SRC/openSUSE:Factory/.cdrdao.new.7948/cdrdao.changes 2019-09-20 14:44:14.274989603 +0200 @@ -1,0 +2,9 @@ +Fri Aug 30 16:53:44 UTC 2019 - Bjørn Lie <[email protected]> + +- Add cdrdao-drop-gconf-dep.patch: Drop dependency on gconf2. + Patch taken from debian. +- Following the above, drop gconf2-devel BuildRequires. +- Refresh patches with quilt. +- Run spec-cleaner, use modern macros. + +------------------------------------------------------------------- New: ---- cdrdao-drop-gconf-dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdrdao.spec ++++++ --- /var/tmp/diff_new_pack.1FNxo6/_old 2019-09-20 14:44:14.838989492 +0200 +++ /var/tmp/diff_new_pack.1FNxo6/_new 2019-09-20 14:44:14.842989490 +0200 @@ -22,8 +22,9 @@ Summary: Tool to write CD-Rs in Disk-At-Once Mode License: GPL-2.0-or-later Group: Productivity/Multimedia/CD/Record -Url: http://cdrdao.sourceforge.net/ +URL: http://cdrdao.sourceforge.net/ 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 @@ -34,18 +35,19 @@ Patch3: cdrdao-1.2.3-stat.patch # PATCH-FIX-UPSTREAM cdrdao-gcc6-fixes.patch [email protected] -- Fix errors seen by GCC6. Patch4: cdrdao-gcc6-fixes.patch +# PATCH-FIX-OPENSUSE cdrdao-drop-gconf-dep.patch -- Drop dependency on gconf2 +Patch5: cdrdao-drop-gconf-dep.patch + +# For autoreconf +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: lame BuildRequires: libao-devel BuildRequires: libsigc++2-devel BuildRequires: libvorbis-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(mad) -# For autoreconf -BuildRequires: automake -BuildRequires: gconf2-devel Obsoletes: gcdmaster <= 1.2.3 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description CDRDAO creates CD-Rs in disk-at-once (DAO) mode driven by a description @@ -55,34 +57,29 @@ into tracks where 2 second gaps would be irritating. %prep -%setup -q -%patch0 -%patch1 -%patch2 -%patch3 -p1 -%patch4 -p1 +%autosetup -p1 %build autoreconf -fvi %configure \ --without-scglib -make %{?_smp_mflags} VERBOSE=1 +%make_build %install %make_install %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING CREDITS ChangeLog README README.PlexDAE cdrdao.lsm +%license COPYING +%doc AUTHORS 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} +%{_mandir}/man1/cue2toc.1%{?ext_man} +%{_mandir}/man1/cdrdao.1%{?ext_man} +%{_mandir}/man1/toc2cddb.1%{?ext_man} +%{_mandir}/man1/toc2cue.1%{?ext_man} %changelog ++++++ cdrdao-1.2.2-scan.patch ++++++ --- /var/tmp/diff_new_pack.1FNxo6/_old 2019-09-20 14:44:14.850989489 +0200 +++ /var/tmp/diff_new_pack.1FNxo6/_new 2019-09-20 14:44:14.854989488 +0200 @@ -1,6 +1,8 @@ ---- 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 @@ +Index: cdrdao-1.2.3/dao/main.cc +=================================================================== +--- cdrdao-1.2.3.orig/dao/main.cc ++++ cdrdao-1.2.3/dao/main.cc +@@ -1935,7 +1935,9 @@ static void scanBus() sdata[i].product, sdata[i].revision); } delete[] sdata; @@ -11,7 +13,7 @@ sdata = ScsiIf::scan(&len, "ATAPI"); if (sdata) { for (i = 0; i < len; i++) { -@@ -1946,6 +1948,7 @@ +@@ -1946,6 +1948,7 @@ static void scanBus() } } #endif @@ -19,9 +21,11 @@ } 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 @@ +Index: cdrdao-1.2.3/xdao/CdDevice.cc +=================================================================== +--- cdrdao-1.2.3.orig/xdao/CdDevice.cc ++++ cdrdao-1.2.3/xdao/CdDevice.cc +@@ -1243,7 +1243,9 @@ void CdDevice::scan() for (i = 0; i < len; i++) CdDevice::add(sdata[i].dev.c_str(), sdata[i].vendor, sdata[i].product); delete[] sdata; @@ -32,7 +36,7 @@ // Only scan for ATAPI devices if we got nothing on the ATA // interface, otherwise every device would show up twice on the // list. -@@ -1255,6 +1257,7 @@ +@@ -1255,6 +1257,7 @@ void CdDevice::scan() } } #endif ++++++ cdrdao-1.2.3-stat.patch ++++++ --- /var/tmp/diff_new_pack.1FNxo6/_old 2019-09-20 14:44:14.858989488 +0200 +++ /var/tmp/diff_new_pack.1FNxo6/_new 2019-09-20 14:44:14.858989488 +0200 @@ -1,6 +1,7 @@ -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 +Index: cdrdao-1.2.3/dao/ScsiIf-linux.cc +=================================================================== +--- cdrdao-1.2.3.orig/dao/ScsiIf-linux.cc ++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc @@ -19,6 +19,9 @@ #include <config.h> ++++++ cdrdao-build.patch ++++++ --- /var/tmp/diff_new_pack.1FNxo6/_old 2019-09-20 14:44:14.862989487 +0200 +++ /var/tmp/diff_new_pack.1FNxo6/_new 2019-09-20 14:44:14.866989486 +0200 @@ -1,5 +1,7 @@ ---- trackdb/FormatConverter.h -+++ trackdb/FormatConverter.h +Index: cdrdao-1.2.3/trackdb/FormatConverter.h +=================================================================== +--- cdrdao-1.2.3.orig/trackdb/FormatConverter.h ++++ cdrdao-1.2.3/trackdb/FormatConverter.h @@ -29,7 +29,7 @@ // Quick abstract class declarations. Format converters should derive ++++++ cdrdao-drop-gconf-dep.patch ++++++ From: Franciscarlos Santos Soares <[email protected]> Date: Wed, 11 Jul 2018 13:15:14 -0300 Subject: Remove dependency on gconf --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: cdrdao-1.2.3/configure.ac =================================================================== --- cdrdao-1.2.3.orig/configure.ac +++ cdrdao-1.2.3/configure.ac @@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE AC_CANONICAL_HOST -AM_GCONF_SOURCE_2 +#AM_GCONF_SOURCE_2 AC_ARG_WITH(pcctsbin,[ --with-pcctsbin=dir set directory of PCCTS parser generator executables],[pcctsbin=$withval],[pcctsbin=default]) ++++++ cdrdao-fixes.patch ++++++ --- /var/tmp/diff_new_pack.1FNxo6/_old 2019-09-20 14:44:14.874989484 +0200 +++ /var/tmp/diff_new_pack.1FNxo6/_new 2019-09-20 14:44:14.874989484 +0200 @@ -1,6 +1,8 @@ ---- paranoia/p_block.c -+++ paranoia/p_block.c -@@ -111,6 +111,7 @@ +Index: cdrdao-1.2.3/paranoia/p_block.c +=================================================================== +--- cdrdao-1.2.3.orig/paranoia/p_block.c ++++ cdrdao-1.2.3/paranoia/p_block.c +@@ -111,6 +111,7 @@ void free_c_block(c_block *c){ } free_elem(c->e,1);
