Hello community, here is the log from the commit of package cdrtools for openSUSE:Factory checked in at 2018-03-24 16:09:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdrtools (Old) and /work/SRC/openSUSE:Factory/.cdrtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdrtools" Sat Mar 24 16:09:27 2018 rev:27 rq:590091 version:3.02~a09 Changes: -------- --- /work/SRC/openSUSE:Factory/cdrtools/cdrtools.changes 2017-12-19 10:45:09.839941215 +0100 +++ /work/SRC/openSUSE:Factory/.cdrtools.new/cdrtools.changes 2018-03-24 16:09:28.084284641 +0100 @@ -1,0 +2,9 @@ +Mon Mar 12 12:01:57 UTC 2018 - [email protected] + +- fix_chrp_boot.patch: chrp-boot option doesn't take any parameters + but seems to require one that it doesn't use. Fix it uses no + parameters. (bnc#1084893) +- Always install to /usr/lib/siconv since otherwise mkisofs doesn't + find charsets. Needs to be fixed properly later. (bnc#1084892) + +------------------------------------------------------------------- New: ---- fix_chrp_boot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdrtools.spec ++++++ --- /var/tmp/diff_new_pack.gvdPxK/_old 2018-03-24 16:09:29.116247441 +0100 +++ /var/tmp/diff_new_pack.gvdPxK/_new 2018-03-24 16:09:29.120247297 +0100 @@ -1,7 +1,7 @@ # # spec file for package cdrtools # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,7 @@ Patch1: gcc48wa.diff # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps). +Patch10: fix_chrp_boot.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: libcap-devel @@ -121,6 +122,7 @@ %prep %setup -qn cdrtools-3.02 %patch -P 1 -p1 +%patch10 -p1 %build # @@ -169,9 +171,9 @@ %endif # -pushd "$b/%_prefix" -test -d "./%_lib" || mv -T ./lib "./%_lib" -popd +# pushd "$b/%_prefix" +# test -d "./%_lib" || mv -T ./lib "./%_lib" +# popd # Needed by cdda2wav (see cdda2wav.c) ln -sf cdda2wav "$b/%_bindir/list_audio_tracks" @@ -299,7 +301,9 @@ %_bindir/isovfy %_bindir/mkhybrid %_bindir/mkisofs -%_libdir/siconv/ +# Hardcoded paths in executable. Needs fixing. This is in /usr/lib/siconv instead for now +# %%_libdir/siconv/ +%_prefix/lib/siconv/ %doc %_mandir/man8/devdump.8%ext_man %doc %_mandir/man8/isodebug.8%ext_man %doc %_mandir/man8/isodump.8%ext_man ++++++ schily-libs.spec ++++++ --- /var/tmp/diff_new_pack.gvdPxK/_old 2018-03-24 16:09:29.148246287 +0100 +++ /var/tmp/diff_new_pack.gvdPxK/_new 2018-03-24 16:09:29.152246143 +0100 @@ -1,7 +1,7 @@ # # spec file for package schily-libs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ fix_chrp_boot.patch ++++++ Index: cdrtools-3.02/mkisofs/mkisofs.c =================================================================== --- cdrtools-3.02.orig/mkisofs/mkisofs.c +++ cdrtools-3.02/mkisofs/mkisofs.c @@ -379,7 +379,7 @@ LOCAL int get_boot_table __PR((char *opt #ifdef APPLE_HYB #ifdef PREP_BOOT LOCAL int get_prep_boot __PR((char *opt_arg)); -LOCAL int get_chrp_boot __PR((char *opt_arg)); +LOCAL int get_chrp_boot __PR((void)); #endif LOCAL int get_bsize __PR((char *opt_arg)); @@ -562,8 +562,7 @@ get_prep_boot(opt_arg) } LOCAL int -get_chrp_boot(opt_arg) - char *opt_arg; +get_chrp_boot() { if (use_chrp_boot) return (1); /* silently allow duplicates */ @@ -1426,7 +1425,7 @@ LOCAL const struct mki_option mki_option #ifdef PREP_BOOT {{"prep-boot&", NULL, (getpargfun)get_prep_boot }, __("\1FILE\1PReP boot image file -- up to 4 are allowed")}, - {{"chrp-boot&", NULL, (getpargfun)get_chrp_boot }, + {{"chrp-boot~", NULL, (getpargfun)get_chrp_boot }, __("Add CHRP boot header")}, #endif /* PREP_BOOT */ {{"cap~", NULL, (getpargfun)hfs_cap },
