diff --git a/schily.spec b/schily.spec index 986dc86..4c10572 100644 --- a/schily.spec +++ b/schily.spec @@ -152,17 +152,6 @@ Group: System/Libraries libfind allows to be used for adding find(1)-like command-line features to programs. -%package -n libhfs1_0 -Summary: HFS volume read/write library with mkhybrid support -Version: %cdr_version -License: GPL-2.0-or-later -Group: System/Libraries - -%description -n libhfs1_0 -A derivative of hfstools's libhfs, used to read and write HFS -filesystems, which has been enhanced with support for hybrid -filesystem images. - %package -n libparanoia1_0 Summary: Compact Disc Digital audio extraction library Version: %cdr_version @@ -257,7 +246,6 @@ Requires: libedc_ecc1_0 = %cdr_version Requires: libedc_ecc_dec1_0 = %cdr_version Requires: libfile1_0 = %box_version Requires: libfind1_0 = %box_version -Requires: libhfs1_0 = %cdr_version Requires: librmt1_0 = %box_version Requires: libschily1_0 = %box_version Requires: libxtermcap1_0 = %box_version @@ -368,6 +356,8 @@ find . "(" -type d -o -type f ")" -exec chmod u+w "{}" "+" %build perl -i -pe 's{\@echo}{echo}' RULES/cc-* +# Static link libhfs, only used by mkisofs. +rm -fv libhfs_iso/shlhfs.mk # Static link libmdigest, very tiny. rm -fv libmdigest/shlmdigest.mk # Static link libshedit, used only by bosh. @@ -486,9 +476,8 @@ rm -f \ $b/usr/lib*/cpp \ $b/usr/lib*/libmakestate.so \ $b/usr/lib*/libmakestate.so.1.0 \ - $b/usr/lib*/libparanoia.so \ + $b/usr/lib*/libhfs.so \ $b/usr/lib*/libshedit.so \ - $b/usr/lib*/libshedit.so.1.0 \ $b/usr/lib*/libstreamar.so \ $b/usr/lib*/libstreamar.so.1.0 \ $b/usr/lib*/svr4.make \ @@ -679,8 +668,6 @@ true %postun -n libfile1_0 -p /sbin/ldconfig %post -n libfind1_0 -p /sbin/ldconfig %postun -n libfind1_0 -p /sbin/ldconfig -%post -n libhfs1_0 -p /sbin/ldconfig -%postun -n libhfs1_0 -p /sbin/ldconfig %post -n libparanoia1_0 -p /sbin/ldconfig %postun -n libparanoia1_0 -p /sbin/ldconfig %post -n librmt1_0 -p /sbin/ldconfig @@ -770,10 +757,6 @@ true %license CDDL.Schily.txt %_libdir/libfind.so.1.0 -%files -n libhfs1_0 -%license libhfs_iso/README -%_libdir/libhfs.so.1.0 - %files -n libparanoia1_0 %license libparanoia/LICENSE %doc libparanoia/README* @@ -818,7 +801,7 @@ true %_libdir/libedc_ecc_dec.so %_libdir/libfile.so %_libdir/libfind.so -%_libdir/libhfs.so +%_libdir/libparanoia.so %_libdir/librmt.so %_libdir/libschily.so %_libdir/libxtermcap.so