Browse Source

updated 7 packages

appstream-data-7-5

fftw3-3.3.9-1

jack-audio-connection-kit-1.9.17-1

lftp-4.9.2-1

libsamplerate-0.2.1-1

libsndfile-1.0.31-1

ttmkfdir-3.0.9-5
Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
f4179dceb0

+ 4 - 1
a/appstream-data/appstream-data-vl.spec

@@ -2,7 +2,7 @@ Summary:        AppStream metadata of Vine Linux packages
 Summary(ja):    Vine LinuxパッケージのAppStreamメタデータ
 Name:           appstream-data
 Version:        7
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -55,6 +55,9 @@ DESTDIR=%{buildroot} appstream-util install-origin vine-plus %{SOURCE2} %{SOURCE
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7-5
+- updated appstream data.
+
 * Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7-4
 - updated appstream data.
 

+ 59 - 40
f/fftw3/fftw3-vl.spec

@@ -1,10 +1,14 @@
-%global quad 1
+%bcond_without check
+%bcond_without quad
 
 Name:           fftw3
-Version:        3.3.8
+Version:        3.3.9
 Release:        1%{?_dist_release}
 Summary:        C subroutines for computing the Discrete Fourier Transform.
-Group:          System Environment/Libraries
+Group:          science
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        GPLv2+
 URL:            http://www.fftw.org
 Source0:        http://www.fftw.org/fftw-%{version}.tar.gz
@@ -15,11 +19,11 @@ BuildRequires:  gcc-gfortran
 BuildRequires:  time
 BuildRequires:  perl
 
-Requires(post): info
-Requires(preun): info
-
-Vendor: Project Vine
-Distribution: Vine Linux
+%if %{with quad}
+%global quad 1
+%else
+%global quad 1
+%endif
 
 %description
 FFTW is a collection of fast C routines for computing the Discrete Fourier Transform
@@ -38,14 +42,14 @@ FFTW は1次元または多次元の離散フーリエ変換(DFT)を計算す
 
 %package libs
 Summary:        FFTW run-time library
-Group:          System Environment/Libraries
+Group:          system
 Provides:       fftw3 = %{version}-%{release}
 # Pull in the actual libraries
-Requires:        %{name}-libs-single = %{version}-%{release}
-Requires:        %{name}-libs-double = %{version}-%{release}
-Requires:        %{name}-libs-long = %{version}-%{release}
+Requires:       %{name}-libs-single = %{version}-%{release}
+Requires:       %{name}-libs-double = %{version}-%{release}
+Requires:       %{name}-libs-long = %{version}-%{release}
 %if %{quad}
-Requires:        %{name}-libs-quad = %{version}-%{release}
+Requires:       %{name}-libs-quad = %{version}-%{release}
 %endif
 
 %description libs
@@ -55,7 +59,7 @@ run-time libraries.
 
 %package devel
 Summary:        Headers, libraries and docs for the FFTW library
-Group:          Development/Libraries
+Group:          programming
 Requires:       pkgconfig
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-libs = %{version}-%{release}
@@ -69,41 +73,46 @@ data, and of arbitrary input size.
 This package contains header files and development libraries needed to
 develop programs using the FFTW fast Fourier transform library.
 
+
 %package libs-double
 Summary:        FFTW library, double precision
-Group:          Development/Libraries
+Group:          system
 
 %description libs-double
 This package contains the FFTW library compiled in double precision.
 
+
 %package libs-single
 Summary:        FFTW library, single precision
-Group:          Development/Libraries
+Group:          system
 
 %description libs-single
 This package contains the FFTW library compiled in single precision.
 
+
 %package libs-long
 Summary:        FFTW library, long double precision 
-Group:          Development/Libraries
+Group:          system
 
 %description libs-long
 This package contains the FFTW library compiled in long double
 precision.
 
+
 %if %{quad}
 %package libs-quad
 Summary:        FFTW library, quadruple
-Group:          Development/Libraries
+Group:          system
 
 %description libs-quad
 This package contains the FFTW library compiled in quadruple
 precision.
 %endif
 
+
 %package        static
 Summary:        Static versions of the FFTW libraries
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name}-devel = %{version}-%{release}
 Provides:       fftw3-static = %{version}-%{release}
 
@@ -111,19 +120,26 @@ Provides:       fftw3-static = %{version}-%{release}
 The fftw-static package contains the statically linkable version of
 the FFTW fast Fourier transform library.
 
+
 %package docs
 Summary:        FFTW library manual
-Group:          Documentation
+Group:          documentation
 BuildArch:      noarch
+Requires(post): info
+Requires(preun): info
 
 %description docs
 This package contains the manual for the FFTW fast Fourier transform
 library.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n fftw-%{version}
 
+
 %build
 # Configure uses g77 by default, if present on system
 export F77=gfortran
@@ -182,6 +198,7 @@ do
  cd ..
 done
 
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %if %{quad}
@@ -195,6 +212,8 @@ done
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 
+
+%if %{with check}
 %check
 bdir=`pwd`
 %if %{quad}
@@ -206,24 +225,10 @@ do
  export LD_LIBRARY_PATH=$bdir/$ver/.libs:$bdir/$ver/threads/.libs
  make -C $ver check
 done
-
-%clean
-rm -rf %{RPM_BUILD_ROOT}
-
-%post libs-single -p /sbin/ldconfig
-%postun libs-single -p /sbin/ldconfig
-
-%post libs-double -p /sbin/ldconfig
-%postun libs-double -p /sbin/ldconfig
-
-%post libs-long -p /sbin/ldconfig
-%postun libs-long -p /sbin/ldconfig
-
-%if %{quad}
-%post libs-quad -p /sbin/ldconfig
-%postun libs-quad -p /sbin/ldconfig
 %endif
 
+
+%ifarch x86_64
 %post docs
 /sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
 
@@ -231,6 +236,7 @@ rm -rf %{RPM_BUILD_ROOT}
 if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
 fi
+%endif
 
 
 %files
@@ -243,21 +249,24 @@ fi
 
 %files libs-single
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%license COPYING COPYRIGHT
+%doc AUTHORS ChangeLog NEWS README* TODO
 %{_libdir}/libfftw3f.so.*
 %{_libdir}/libfftw3f_threads.so.*
 %{_libdir}/libfftw3f_omp.so.*
 
 %files libs-double
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%license COPYING COPYRIGHT
+%doc AUTHORS ChangeLog NEWS README* TODO
 %{_libdir}/libfftw3.so.*
 %{_libdir}/libfftw3_threads.so.*
 %{_libdir}/libfftw3_omp.so.*
 
 %files libs-long
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%license COPYING COPYRIGHT
+%doc AUTHORS ChangeLog NEWS README* TODO
 %{_libdir}/libfftw3l.so.*
 %{_libdir}/libfftw3l_threads.so.*
 %{_libdir}/libfftw3l_omp.so.*
@@ -265,7 +274,8 @@ fi
 %if %{quad}
 %files libs-quad
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
+%license COPYING COPYRIGHT
+%doc AUTHORS ChangeLog NEWS README* TODO
 %{_libdir}/libfftw3q.so.*
 %{_libdir}/libfftw3q_threads.so.*
 %{_libdir}/libfftw3q_omp.so.*
@@ -274,14 +284,19 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/fftw3*
+%{_libdir}/cmake/fftw3
 %{_libdir}/pkgconfig/fftw3*.pc
 %{_libdir}/libfftw3*.so
 
+%ifarch x86_64
 %files docs
 %defattr(-,root,root,-)
 %doc doc/*.pdf doc/html/
 %doc doc/FAQ/fftw-faq.html/
 %doc %{_infodir}/fftw3.info*
+%else
+%exclude %{_infodir}/fftw3.info*
+%endif
 
 %files static
 %defattr(-,root,root,-)
@@ -289,6 +304,10 @@ fi
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.9-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Sun Jun 03 2018 Toshiaki Ara <ara_t@384.jp> 3.3.8-1
 - new upstream release
 

+ 42 - 45
j/jack-audio-connection-kit/jack-audio-connection-kit-vl.spec

@@ -1,44 +1,37 @@
 Summary: The Jack Audio Connection Kit
 Name: jack-audio-connection-kit
-Version: 1.9.12
-Release: 3%{?_dist_release}
-# The entire source (~500 files) is a mixture of these three licenses
-License: GPLv2 and GPLv2+ and LGPLv2+
-Group: System Environment/Daemons
-URL: http://www.jackaudio.org
-
+Version: 1.9.17
+Release: 1%{?_dist_release}
+Group: multimedia,system
 Vendor: Project Vine
 Distribution: Vine Linux
 
+# The entire source (~500 files) is a mixture of these three licenses
+License: GPLv2 and GPLv2+ and LGPLv2+
+URL: http://www.jackaudio.org
 #Source0: http://www.jackaudio.org/downloads/%{name}-%{version}.tar.gz
-Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
+Source0: https://github.com/jackaudio/jack2/archive/refs/tags/v%{version}.tar.gz#/jack2-%{version}.tar.gz
 Source1: %{name}-README.Fedora
 Source2: %{name}-script.pa
 Source3: %{name}-limits.conf
-
-# No-date-footer hack to remove dates from doxygen documentation
-Patch0:        jack2-1.9.12-nodate.patch
-# Build fix
-Patch1:        jack2-1.9.12-outdir.patch
-# We don't want the internal API documentation
-Patch2:        jack2-1.9.12-nointernalapi.patch
+# Generate this file in the GIT repo by running ./svnversion_regenerate.sh svnversion.h
+Source4:       svnversion.h
+# Patch doxygen documentation
+Patch0:        %{name}-doxygen.patch
 # Adjust default priority. RHBZ#795094
-Patch3:        jack-realtime-compat.patch
-# Remove binary junk from README
-Patch4:        jack2-1.9.12-nojunk.patch
+Patch1:        jack-realtime-compat.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: alsa-lib-devel
-BuildRequires: celt-devel
 BuildRequires: dbus-devel
 BuildRequires: doxygen
 BuildRequires: expat-devel
-BuildRequires: libfreebob-devel >= 1.0.0
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: ncurses-devel
+BuildRequires: opus-devel
 BuildRequires: pkgconfig
-BuildRequires: python
+BuildRequires: python3
 BuildRequires: readline-devel
 #BuildRequires: autoconf >= 2.59, automake >= 1.9.3, libtool
 #BuildRequires: libdb-devel
@@ -48,7 +41,6 @@ BuildRequires: readline-devel
 %global pagroup   pulse-rt
 
 Requires(pre): shadow-utils
-Requires(post): /sbin/ldconfig
 
 %description
 JACK is a low-latency audio server, written primarily for the Linux
@@ -63,9 +55,10 @@ designed from the ground up to be suitable for professional audio
 work. This means that it focuses on two key areas: synchronous
 execution of all clients, and low latency operation.
 
+
 %package dbus
 Summary:	Jack D-Bus launcher
-Group:		Applications/Multimedia
+Group:		multimedia
 Requires: 	%{name} = %{version}-%{release}
 
 %description dbus
@@ -75,51 +68,51 @@ Launcher to start Jack through D-Bus.
 %package devel
 Summary: 	Development files for %{name}
 Summary(ja): 	%{name} の開発用ファイル
-Group: 		Development/Libraries
+Group: 		programming
 Requires: 	%{name} = %{version}-%{release}
 Requires: 	pkgconfig
 
 %description devel
 Development files for the Jack Audio Connection Kit.
 
+
 %package example-clients
 Summary: 	Example clients that use Jack 
 Summary(ja): 	%{name} を利用したサンプルプログラム
-Group: 		Applications/Multimedia
+Group: 		multimedia
 Requires: 	%{name} = %{version}-%{release}
 
 %description example-clients
 Small example clients that use the Jack Audio Connection Kit.
 
+
+%debug_package
+
+
 %prep
-%setup -q -n jack2-%{version}
-%patch0 -p1 -b .nodate
-%patch1 -p1 -b .outdir
-%patch2 -p1 -b .nointernalapi
-%patch3 -p1 -b .priority
-%patch4 -p1 -b .nojunk
+%autosetup -p1  -n jack2-%{version}
+
 
 %build
-export CPPFLAGS="$RPM_OPT_FLAGS"
+cp -p %{SOURCE4} .
+%set_build_flags
 export PREFIX=%{_prefix}
 # Parallel build disabled as it fails sometimes
-./waf configure \
-      %{?_smp_mflags} \
+python3 ./waf configure \
       --mandir=%{_mandir}/man1 \
       --libdir=%{_libdir} \
-      --alsa \
+      --doxygen \
+      --dbus \
       --classic \
+      --alsa \
       --clients 256 \
-      --dbus \
-      --doxygen \
-      --freebob \
       --ports-per-application=2048
 
 ./waf build %{?_smp_mflags} -v
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
-./waf --destdir=$RPM_BUILD_ROOT install
+python3 ./waf --destdir=$RPM_BUILD_ROOT install
 
 # move doxygen documentation to the right place
 mv $RPM_BUILD_ROOT%{_datadir}/jack-audio-connection-kit/reference .
@@ -142,16 +135,11 @@ mv $RPM_BUILD_ROOT%{_bindir}/jack_rec $RPM_BUILD_ROOT%{_bindir}/jackrec
 # Fix permissions of the modules
 chmod 755 $RPM_BUILD_ROOT%{_libdir}/jack/*.so $RPM_BUILD_ROOT%{_libdir}/libjack*.so.*.*.*
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group %groupname > /dev/null || groupadd -r %groupname
 exit 0
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %files 
 %defattr(-,root,root)
@@ -210,6 +198,7 @@ exit 0
 %{_bindir}/jack_net_master
 %{_bindir}/jack_net_slave
 %{_bindir}/jack_netsource
+%{_bindir}/jack_property
 %{_bindir}/jack_samplerate
 %{_bindir}/jack_server_control
 %{_bindir}/jack_session_notify
@@ -231,6 +220,7 @@ exit 0
 %{_mandir}/man1/jack_metro.1*
 %{_mandir}/man1/jack_monitor_client.1*
 %{_mandir}/man1/jack_netsource.1*
+%{_mandir}/man1/jack_property.1*
 %{_mandir}/man1/jack_samplerate.1*
 %{_mandir}/man1/jack_showtime.1*
 %{_mandir}/man1/jack_simple_client.1*
@@ -247,6 +237,13 @@ exit 0
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.17-1
+- new upstream release.
+- dropped Patch0, 1, 2 and 4.
+- imported Patch0 from rawhide.
+- renumbered patches.
+- dropped ldconfig scriptlets.
+
 * Wed Sep 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.12-3
 - rebuilt only.
 

+ 18 - 10
l/lftp/lftp-vl.spec

@@ -1,12 +1,15 @@
 Summary: A sophisticated file transfer program
 Summary(ja): 洗練された ftp/http クライアント
 Name: lftp
-Version: 4.8.4
+Version: 4.9.2
 Release: 1%{?_dist_release}
+Group: internet
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwamoto
+
 License: GPLv3
-Group: Applications/Internet
 URL: http://lftp.yar.ru/
-
 Source: http://lftp.yar.ru/ftp/lftp-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -17,10 +20,6 @@ BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: zlib-devel
 
-Packager: iwamoto
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
 control and uses the readline library for input. It has bookmarks, built-in
@@ -33,10 +32,11 @@ LFTP は洗練された ftp/http ファイル転送プログラムです.Bash
 リング機能も組み込まれており、複数のファイルを並列して転送することも可能です。 
 もちろん、信頼性を念頭に設計されています。
 
+
 %package scripts
 Summary:	Scripts for lftp
 Summary(ja): 	LFTP のユーティリティスクリプト
-Group:		Applications/Internet
+Group:		internet
 Requires:	lftp = %{version}-%{release}
 Requires:	perl(DBD::SQLite)
 BuildArch:	noarch
@@ -47,12 +47,17 @@ Utility scripts for use with lftp.
 %description scripts -l ja
 LFTP のユーティリティスクリプトです。
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
 # cp po/ja.po po/ja.po.orig
 # msgmerge -v %{SOURCE10} po/ja.po.orig -o po/ja.po
 
+
 %build
 CFLAGS="%{optflags}"
 CXXFLAGS="%{optflags}"
@@ -73,6 +78,7 @@ export LDFLAGS
 export tagname=CC
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}
@@ -86,8 +92,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -113,7 +117,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_datadir}/lftp
 
+
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.9.2-1
+- new upstream release.
+
 * Wed Oct 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.8.4-1
 - new upstream release.
 

+ 30 - 62
lib/libs/libsamplerate/libsamplerate-vl.spec

@@ -3,15 +3,21 @@
 Summary: Audio Sample Rate Converter library
 Summary(ja): 音声サンプリングレート変換ライブラリ
 Name: libsamplerate
-Version: 0.1.8
+Version: 0.2.1
 Release: 1%{?_dist_release}
-Source0: %{name}-%{version}.tar.gz
-URL: http://www.mega-nerd.com/SRC/index.html
-License: GPLv2
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: BSD
+URL: http://libsndfile.github.io/libsamplerate/
+Source0: https://github.com/libsndfile/libsamplerate/releases/download/%{version}/libsamplerate-%{version}.tar.bz2
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libsndfile-devel >= 1.0.6
+BuildRequires: fftw3-devel
+Obsoletes: libsamplerate-docs < 0.2.0
+Obsoletes: libsamplerate-progs < 0.2.0
 
 %description
 Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for
@@ -31,10 +37,11 @@ signal-to-noise ratio of 97dB with -3dB passband extending from DC to
 96% of the theoretical best bandwidth for a given pair of input and
 output sample rates.
 
+
 %package devel
 Summary: Audio Sample Rate Converter development files
 Summary(ja): 音声サンプリングレート変換ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -56,45 +63,12 @@ signal-to-noise ratio of 97dB with -3dB passband extending from DC to
 96% of the theoretical best bandwidth for a given pair of input and
 output sample rates.
 
-%package progs
-Summary: Audio Sample Rate Converter
-Summary(ja): 音楽サンプリングレート変換ツール
-Group: Applications/Multimedia
-Requires: %{name} = %{version}
-
-%description progs
-Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for
-audio. One example of where such a thing would be useful is
-converting audio from the CD sample rate of 44.1kHz to the 48kHz
-sample rate used by DAT players.
-
-SRC is capable of arbitrary and time varying conversions ; from
-downsampling by a factor of 12 to upsampling by the same
-factor. Arbitrary in this case means that the ratio of input and
-output sample rates can be an irrational number. The conversion ratio
-can also vary with time for speeding up and slowing down effects.
-
-SRC provides a small set of converters to allow quality to be traded
-off against computation cost. The current best converter provides a
-signal-to-noise ratio of 97dB with -3dB passband extending from DC to
-96% of the theoretical best bandwidth for a given pair of input and
-output sample rates.
-
-%package        docs
-Summary:        Documentation for %{name}
-Summary(ja):    %{name} 用のドキュメント
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-
-%description    docs
-This package contains documentation for %{name}.
 
 # compat32
 %package -n compat32-%{name}
 Summary: Audio Sample Rate Converter library
 Summary(ja): 音声サンプリングレート変換ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for
@@ -114,10 +88,11 @@ signal-to-noise ratio of 97dB with -3dB passband extending from DC to
 96% of the theoretical best bandwidth for a given pair of input and
 output sample rates.
 
+
 %package -n compat32-%{name}-devel
 Summary: Audio Sample Rate Converter development files
 Summary(ja): 音声サンプリングレート変換ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 
@@ -139,32 +114,28 @@ signal-to-noise ratio of 97dB with -3dB passband extending from DC to
 96% of the theoretical best bandwidth for a given pair of input and
 output sample rates.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%doc doc/*.html doc/SRC.*
+%license COPYING
+%doc %{_pkgdocdir}/*
 %{_libdir}/*.so.*
 
 %files devel
@@ -173,14 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/samplerate.pc
 %{_includedir}/samplerate.h
 
-%files progs
-%defattr(-,root,root)
-%{_bindir}/sndfile-resample
-
-%files docs
-%defattr(-,root,root)
-%{_docdir}/%{name}0-dev
-
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -194,6 +157,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.2.1-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- dropped *-progs and *-docs.
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.8-1
 - update to 0.1.8
 - create %%{name}-docs subpackage

+ 52 - 55
lib/libs/libsndfile/libsndfile-vl.spec

@@ -3,45 +3,31 @@
 Summary:        A library to handle various audio file formats.
 Summary(ja):    さまざまなフォーマットの音声ファイルを扱うライブラリ
 Name:           libsndfile
-Version:        1.0.28
-Release:        2%{?_dist_release}
-
+Version:        1.0.31
+Release:        1%{?_dist_release}
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        LGPLv2+ and GPLv2+ and BSD
-Group:          System Environment/Libraries
-URL:            http://www.mega-nerd.com/libsndfile/
-
-Source0:        http://www.mega-nerd.com/libsndfile/files/%{name}-%{version}.tar.gz
-
+URL:            http://libsndfile.github.io/libsndfile/
+Source0:        https://github.com/libsndfile/libsndfile/releases/download/%{version}/libsndfile-%{version}.tar.bz2
 Patch0:         %{name}-1.0.25-system-gsm.patch
-Patch1:         libsndfile-1.0.25-zerodivfix.patch
+Patch1:         %{name}-1.0.25-zerodivfix.patch
 
 # security fix
-Patch100:       CVE-2017-8365.patch
-Patch101:       CVE-2017-8363.patch
-Patch102:       CVE-2017-8362.patch
-Patch103:       CVE-2017-6892.patch
-Patch104:       CVE-2019-3832.patch
-Patch105:       binheader-heapoverflow.patch
-Patch106:       fix_rf64_arm.patch
-Patch107:       fix_typos.patch
-Patch108:       a-ulaw-fix-multiple-buffer-overflows-432.patch
-Patch109:       double64_init-Check-psf-sf.channels-against-upper-bo.patch
-Patch110:       src-wav.c-Fix-heap-read-overflow.patch
-Patch111:       Check-MAX_CHANNELS-in-sndfile-deinterleave.patch
-
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	alsa-lib-devel
-BuildRequires:	flac-devel
-BuildRequires:	libogg-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	pkgconfig
-BuildRequires:	sqlite3-devel
-BuildRequires:	gsm-devel
 
+BuildRequires:  alsa-lib-devel
+BuildRequires:  flac-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  pkgconfig
+BuildRequires:  sqlite3-devel
+BuildRequires:  gsm-devel
+BuildRequires:  python3
+BuildRequires:  opus-devel
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -53,7 +39,7 @@ point WAV files and a number of compressed formats.
 %package devel
 Summary: Libraries, includes, etc to develop libsndfile applications
 Summary(ja): libsndfile アプリケーションを開発するためのファイル集
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -61,11 +47,23 @@ Requires: pkgconfig
 Libraries, include files, etc you can use to develop libsndfile applications.
 
 
+%package utils
+Summary: Command Line Utilities for libsndfile
+Summary(ja): libsndfileのコマンドラインユーティリティ
+Group: multimedia,system
+Requires: %{name} = %{version}-%{release}
+
+%description utils
+libsndfile is a C library for reading and writing sound files such as
+AIFF, AU, WAV, and others through one standard interface.
+This package contains command line utilities for libsndfile.
+
+
 # compat32
 %package -n compat32-%{name}
 Summary: A library to handle various audio file formats.
 Summary(ja): さまざまなフォーマットの音声ファイルを扱うライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 libsndfile is a C library for reading and writing sound files such as
@@ -77,7 +75,7 @@ point WAV files and a number of compressed formats.
 %package -n compat32-%{name}-devel
 Summary: Libraries, includes, etc to develop libsndfile applications
 Summary(ja): libsndfile アプリケーションを開発するためのファイル集
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: compat32-pkgconfig
 Requires: %{name}-devel = %{version}-%{release}
@@ -86,10 +84,14 @@ Requires: %{name}-devel = %{version}-%{release}
 Libraries, include files, etc you can use to develop libsndfile applications.
 
 
+%debug_package
+
+
 %prep
 %autosetup -p1 
+rm -r src/GSM610
+autoreconf -I m4 -fiv # for system-gsm patch
 
-rm -r src/GSM610 ; autoreconf -I M4 -fiv # for system-gsm patch
 
 %build
 %configure \
@@ -105,16 +107,15 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf html
-cp -pr $RPM_BUILD_ROOT%{_datadir}/doc/libsndfile html
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libsndfile
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-
+rm -rf __docs
+mkdir __docs
+cp -pR $RPM_BUILD_ROOT%{_docdir}/%{name}/* __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+find %{buildroot} -type f -name "*.la" -delete
 
 # fix multilib issues
 %if %{__isa_bits} == 64
@@ -138,39 +139,30 @@ cat > $RPM_BUILD_ROOT%{_includedir}/sndfile.h <<EOF
 #endif
 EOF
 
+
 %check
 LD_LIBRARY_PATH=$PWD/src/.libs make check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%if %{build_compat32}
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
-%endif
 
 %files
 %defattr(-,root,root)
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README*
 %{_libdir}/libsndfile.so.*
-%{_bindir}/*
-%{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root)
-%doc html/*
+%doc __docs/*
 %{_libdir}/libsndfile.so
 %{_includedir}/sndfile.h
 %{_includedir}/sndfile.hh
 %{_includedir}/sndfile-%{wordsize}.h
 %{_libdir}/pkgconfig/sndfile.pc
 
+%files utils
+%{_bindir}/*
+%{_mandir}/man1/*
+
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -186,6 +178,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.31-1
+- new upstream release.
+- dropped Patch100-111: fixed in upstream.
+- dropped ldconfig scriptlets.
+
 * Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.28-2
 - removed a comment in %%postun script.
 

+ 23 - 22
t/ttmkfdir/ttmkfdir-vl.spec

@@ -2,8 +2,15 @@ Summary: Utility to create fonts.scale files for truetype fonts
 Summary(ja): TrueType フォント用に fonts.scale ファイルを作成するためのユーティリティ
 Name: ttmkfdir
 Version: 3.0.9
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
+Group: Applications/System
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
+License: LGPLv2+
 Source0: %{name}-%{version}.tar.bz2
+Source10: ttmkfdir.1
 Patch: ttmkfdir-3.0.9-cpp.patch
 Patch1: ttmkfdir-3.0.9-zlib.patch
 Patch2: ttmkfdir-3.0.9-fix-freetype217.patch
@@ -15,9 +22,9 @@ Patch7: ttmkfdir-3.0.9-encoding-dir.patch
 Patch8: ttmkfdir-3.0.9-font-scale.patch
 Patch9: ttmkfdir-3.0.9-bug434301.patch
 Patch10: ttmkfdir-3.0.9-freetype-header-fix2.patch
-Source10: ttmkfdir.1
-License: LGPLv2+
-Group: Applications/System
+Patch11: ttmkfdir-3.0.9-fedora-ldflags.patch
+Patch12: ttmkfdir-3.0.9-tag.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: freetype2-devel >= 2.0
 BuildRequires: zlib-devel flex
@@ -26,31 +33,23 @@ BuildRequires: libtool
 # ttmkfdir used to be in the following packages at one point
 Conflicts: freetype-utils <= 1.3.1-5vl5
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 ttmkfdir is a utility used to create fonts.scale files in
 TrueType font directories in order to prepare them for use
 by the font server.
 
+
+%debug_package
+
+
 %prep
 %setup -q
-%patch -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%autopatch -p1
+
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS -fPIC" RPM_LD_FLAGS="$RPM_LD_FLAGS -pie"
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,8 +57,6 @@ make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
 mkdir -p %{buildroot}%{_mandir}/man1/
 cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -67,7 +64,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ttmkfdir
 %{_mandir}/man1/ttmkfdir.1*
 
+
 %changelog
+* Thu Mar 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.9-5
+- imported Patch11 and 12 from rawhide.
+
 * Thu Jun 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.9-4
 - rebuilt with new toolchain.
 - added Patch10.