- Add iconv-name.diff; rename cp10000 to macintosh to workaround

glibc [boo#1089126]

OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=9

iconv-name.diff

@@ -0,0 +1,73 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2018-04-11 20:00:58.584068848 +0200
+
+Workaround a shortcoming in glibc which lacks cp1XXX identifiers
+without having to install any siconv tables.
+---
+ mkisofs/mkisofs.8 |   13 ++++++-------
+ mkisofs/mkisofs.c |    4 ++--
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+Index: schily-2018-03-16/mkisofs/mkisofs.8
+===================================================================
+--- schily-2018-03-16.orig/mkisofs/mkisofs.8
++++ schily-2018-03-16/mkisofs/mkisofs.8
+@@ -2344,8 +2344,8 @@ Input charset that defines the character
+ used with the
+ .I \-mac\-name
+ option.
+-The default charset is cp10000 (Mac Roman)
+-.I cp10000
++The default charset is
++.I macintosh
+ (Mac Roman)
+ See
+ .B "CHARACTER SETS
+@@ -2555,7 +2555,7 @@ any of the various Apple/Unix file forma
+ option. See the
+ .B HFS MACINTOSH FILE NAMES
+ for more information. Defaults to
+-.I cp10000
++.I macintosh
+ (Mac Roman).
+ .TP
+ .B \-output\-hfs\-charset
+@@ -3070,13 +3070,12 @@ name will be used in the TRANS.TBL file,
+ .PP
+ The character set used to convert any HFS file name to a Joliet/Rock Ridge
+ file name defaults to
+-.I cp10000
++.I macintosh
+ (Mac Roman).
+ The character set used can be specified using the
+ .I \-input\-hfs\-charset
+-option. Other built in HFS character sets are: cp10006 (MacGreek),
+-cp10007 (MacCyrillic), cp10029 (MacLatin2), cp10079 (MacIcelandic) and
+-cp10081 (MacTurkish).
++option. Other built in HFS character sets are:
++MAC-CYRILLIC (MacCyrillic), MAC-CENTRALEUROPE (MacLatin2), MAC-IS (MacIcelandic).
+ .PP
+ Note: the character codes used by HFS file names taken from the various
+ Apple/Unix formats will not be converted as they are assumed to be in the
+Index: schily-2018-03-16/mkisofs/mkisofs.c
+===================================================================
+--- schily-2018-03-16.orig/mkisofs/mkisofs.c
++++ schily-2018-03-16/mkisofs/mkisofs.c
+@@ -2849,7 +2849,7 @@ setcharset:
+ 
+ #ifdef APPLE_HYB
+ 	if (hfs_icharset == NULL || strcmp(hfs_icharset, "mac-roman") == 0) {
+-		hfs_icharset = "cp10000";
++		hfs_icharset = "macintosh";
+ 	}
+ 	hfs_inls = sic_open(hfs_icharset);
+ 
+@@ -2857,7 +2857,7 @@ setcharset:
+ 		hfs_ocharset = hfs_inls ? hfs_inls->sic_name : NULL;
+ 	}
+ 	if (hfs_ocharset == NULL || strcmp(hfs_ocharset, "mac-roman") == 0) {
+-		hfs_ocharset = "cp10000";
++		hfs_ocharset = "macintosh";
+ 	}
+ 	hfs_onls = sic_open(hfs_ocharset);
+ 

schily.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 11 19:03:52 UTC 2018 - jengelh@inai.de
+
+- Add iconv-name.diff; rename cp10000 to macintosh to workaround
+  glibc [boo#1089126]
+
 -------------------------------------------------------------------
 Wed Apr  4 12:10:08 UTC 2018 - jengelh@inai.de
 

schily.spec

@@ -32,6 +32,7 @@ Url:            http://cdrtools.sourceforge.net/private/cdrecord.html
 Source:         https://downloads.sf.net/schilytools/%name-%rver.tar.bz2
 Patch1:         gcc48wa.diff
 Patch2:         mkisofs-j-crash.diff
+Patch3:         iconv-name.diff
 # Honor https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Upstream_policy
 # and submit patches upstream FIRST (cc to the bspkg maintainer perhaps).
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -155,9 +156,10 @@ to programs.
 
 %package -n libparanoia1_0
 Summary:        Compact Disc Digital audio extraction library
-Version:        %cdr_version
+License:        LGPL-2.1-only
-License:        LGPL-2.1
 Group:          System/Libraries
+Version:        %cdr_version
+Release:        0
 
 %description -n libparanoia1_0
 libparanoia is a Compact Disc Digital Audio (CD-DA) Digital Audio
@@ -356,7 +358,7 @@ connection, and through that, have the rmt program executed.
 
 %prep
 %setup -qn %name-%rver
-%patch -P 1 -P 2 -p1
+%patch -P 1 -P 2 -P 3 -p1
 find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+"
 
 %build
@@ -643,7 +645,6 @@ rm -f \
    $b/usr/share/man/man5/streamarchive.5 \
    $b/usr/share/man/man8/sformat.8
 
-
 # Remove documentation (will be added in %_datadir/doc/packages/*)
 #rm -Rf "$b/%_datadir/doc"/*