Browse Source

updated 6 packages

LibRaw-0.20.2-1

djvulibre-3.5.28-1

libvorbis-1.3.7-1

re2c-2.0.3-1

vorbis-tools-1.4.2-1

xterm-366-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12561 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
0e5e38c382

+ 6 - 4
L/LibRaw/LibRaw-vl.spec

@@ -3,8 +3,8 @@
 Summary: Library for reading RAW files obtained from digital photo cameras
 Summary: Library for reading RAW files obtained from digital photo cameras
 Summary(ja): デジタルカメラから取り込んだ RAW ファイルを読むためのライブラリ
 Summary(ja): デジタルカメラから取り込んだ RAW ファイルを読むためのライブラリ
 Name: LibRaw
 Name: LibRaw
-Version: 0.20.0
-Release: 2%{?_dist_release}
+Version: 0.20.2
+Release: 1%{?_dist_release}
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -12,7 +12,6 @@ Distribution: Vine Linux
 License: BSD and (CDDL or LGPLv2)
 License: BSD and (CDDL or LGPLv2)
 URL: https://www.libraw.org/
 URL: https://www.libraw.org/
 Source0: https://www.libraw.org/data/LibRaw-%{version}.tar.gz
 Source0: https://www.libraw.org/data/LibRaw-%{version}.tar.gz
-Patch1000: LibRaw-Additional-checks-in-hassy-model-parser.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc libtool make
 BuildRequires: gcc libtool make
@@ -57,7 +56,6 @@ This package contains the static library for %{name}.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch1000 -p1
 
 
 
 
 %build
 %build
@@ -118,6 +116,10 @@ rm -rf %{buildroot}%{_libdir}/*.la
 
 
 
 
 %changelog
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.20.2-1
+- new upstream release.
+- dropped Patch1000: fixed in upstream.
+
 * Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.20.0-2
 * Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.20.0-2
 - imported Patch1000 from upstream to fix CVE-2020-24890.
 - imported Patch1000 from upstream to fix CVE-2020-24890.
 
 

+ 33 - 14
d/djvulibre/djvulibre-vl.spec

@@ -1,8 +1,9 @@
 Summary: DjVu viewers, encoders and utilities.
 Summary: DjVu viewers, encoders and utilities.
 Summary(ja): DjVu 画像形式ファイル操作用ライブラリ、ツール
 Summary(ja): DjVu 画像形式ファイル操作用ライブラリ、ツール
 Name: djvulibre
 Name: djvulibre
-Version: 3.5.27
+Version: 3.5.28
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: graphics
 Distribution: Project Vine
 Distribution: Project Vine
 Vendor: Vine Linux
 Vendor: Vine Linux
 Packager: owa
 Packager: owa
@@ -12,12 +13,7 @@ URL: http://djvu.sourceforge.net
 Source0: http://prdownloads.sourceforge.net/djvu/djvulibre-%{version}.tar.gz
 Source0: http://prdownloads.sourceforge.net/djvu/djvulibre-%{version}.tar.gz
 
 
 Patch0: djvulibre-3.5.22-cdefs.patch
 Patch0: djvulibre-3.5.22-cdefs.patch
-Patch2: djvulibre-3.5.27-buffer-overflow.patch
-Patch3: djvulibre-3.5.27-infinite-loop.patch
-Patch4: djvulibre-3.5.27-stack-overflow.patch
-Patch5: djvulibre-3.5.27-zero-bytes-check.patch
 Patch6: djvulibre-3.5.27-export-file.patch
 Patch6: djvulibre-3.5.27-export-file.patch
-Patch7: djvulibre-3.5.27-null-dereference.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtiff-devel
 BuildRequires: libtiff-devel
@@ -27,6 +23,9 @@ BuildRequires: inkscape
 BuildRequires: xdg-utils chrpath
 BuildRequires: xdg-utils chrpath
 BuildRequires: hicolor-icon-theme
 BuildRequires: hicolor-icon-theme
 
 
+Requires(post): xdg-utils
+Requires(preun): xdg-utils
+
 %description 
 %description 
 DjVu is a web-centric format and software platform for distributing documents
 DjVu is a web-centric format and software platform for distributing documents
 and images.  DjVu content downloads faster, displays and renders faster, looks
 and images.  DjVu content downloads faster, displays and renders faster, looks
@@ -53,15 +52,26 @@ DjVulibre-3.5 contains:
 - An up-to-date version of the C++ DjVu Reference Library.
 - An up-to-date version of the C++ DjVu Reference Library.
 
 
 
 
+%package libs
+Summary: Library files for DjVuLibre
+Group: programming
+
+%description libs
+Library files for DjVuLibre.
+
+
 %package devel
 %package devel
 Summary: The libraries and header files needed for djvulibre development.
 Summary: The libraries and header files needed for djvulibre development.
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Group: programming
+Requires: %{name}-libs = %{version}-%{release}
 
 
 %description devel
 %description devel
 DjVulibre libraries and header files for development.
 DjVulibre libraries and header files for development.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{name}-%{version}
 %setup -q -n %{name}-%{version}
 %autopatch -p1
 %autopatch -p1
@@ -115,8 +125,7 @@ done
 popd
 popd
 
 
 
 
-%preun -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
 
 
 
 %clean
 %clean
@@ -126,10 +135,8 @@ rm -rf %{buildroot}
 %files
 %files
 %defattr(-, root, root)
 %defattr(-, root, root)
 %license COPYRIGHT COPYING
 %license COPYRIGHT COPYING
-%doc README NEWS doc
-%{_bindir}
-%{_libdir}/lib*.so.*
-%exclude %{_libdir}/libdjvulibre.la
+%doc README NEWS
+%{_bindir}/*
 %exclude %{_datadir}/djvu/osi/de/*
 %exclude %{_datadir}/djvu/osi/de/*
 %exclude %{_datadir}/djvu/osi/fr/*
 %exclude %{_datadir}/djvu/osi/fr/*
 %exclude %{_datadir}/djvu/osi/zh/*
 %exclude %{_datadir}/djvu/osi/zh/*
@@ -143,14 +150,26 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/mimetypes/*
 %{_datadir}/icons/hicolor/*/mimetypes/*
 %{_mandir}/man?
 %{_mandir}/man?
 
 
+%files libs
+%license COPYRIGHT COPYING
+%doc README NEWS
+%{_libdir}/*.so.*
+
 %files devel
 %files devel
 %defattr(-, root, root)
 %defattr(-, root, root)
+%doc doc
 %{_includedir}/libdjvu
 %{_includedir}/libdjvu
 %{_libdir}/lib*.so
 %{_libdir}/lib*.so
+%exclude %{_libdir}/*.la
 %{_libdir}/pkgconfig/ddjvuapi.pc
 %{_libdir}/pkgconfig/ddjvuapi.pc
 
 
 
 
 %changelog
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.28-1
+- new upstream release.
+- added a subpackage: djvulibre-libs.
+- dropped Patch2-5 and 7: fixed in upstream.
+
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.27-1
 * Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.27-1
 - new upstream release.
 - new upstream release.
 
 

+ 54 - 26
lib/libv/libvorbis/libvorbis-vl.spec

@@ -1,28 +1,24 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define liboggver 1.3.2
 %define liboggver 1.3.2
-%define epoch_num 1
 
 
 Summary:	The Vorbis General Audio Compression Codec.
 Summary:	The Vorbis General Audio Compression Codec.
 Summary(ja):	Vorbis - 汎用オーディオ圧縮コーデック
 Summary(ja):	Vorbis - 汎用オーディオ圧縮コーデック
 Name:		libvorbis
 Name:		libvorbis
-Version:	1.3.6
+Epoch:		1
+Version:	1.3.7
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
-Epoch:          %{epoch_num}
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 
-Group:		System Environment/Libraries
 License:	BSD
 License:	BSD
 URL:		https://www.xiph.org/
 URL:		https://www.xiph.org/
-
 Source:		http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
 Source:		http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
-Patch0:		libvorbis-1.3.6-git.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libogg-devel >= %{liboggver}
 BuildRequires:	libogg-devel >= %{liboggver}
 BuildRequires:  perl
 BuildRequires:  perl
 
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
 %description
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
 general-purpose compressed audio format for audio and music at fixed
 general-purpose compressed audio format for audio and music at fixed
@@ -39,11 +35,12 @@ kbps の固定/可変ビットレートのオーディオや音楽用です。
 このパッケージには、Ogg Vorbis をサポートするプログラムで使われるランタ
 このパッケージには、Ogg Vorbis をサポートするプログラムで使われるランタ
 イムライブラリが含まれています。
 イムライブラリが含まれています。
 
 
+
 %package devel
 %package devel
 Summary:	Development files for Vorbis applications.
 Summary:	Development files for Vorbis applications.
 Summary(ja):	Vorbis アプリケーションの開発用ファイル
 Summary(ja):	Vorbis アプリケーションの開発用ファイル
-Group:		Development/Libraries
-Requires:	%{name} = %{epoch_num}:%{version}-%{release}
+Group:		programming
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	libogg-devel >= %{liboggver}
 Requires:	libogg-devel >= %{liboggver}
 
 
 %description devel
 %description devel
@@ -54,11 +51,22 @@ and documentation needed to develop applications with libvorbis.
 このパッケージには、libvorbis を使ったアプリケーションの開発に必要な
 このパッケージには、libvorbis を使ったアプリケーションの開発に必要な
 ヘッダファイル、静的ライブラリ、及びドキュメントが含まれています。
 ヘッダファイル、静的ライブラリ、及びドキュメントが含まれています。
 
 
+
+%package	devel-docs
+Summary:	Documentation for developing Vorbis applications
+Group:		documentation
+BuildArch:	noarch
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+
+%description	devel-docs
+Documentation for developing applications with libvorbis.
+
+
 # compat32
 # compat32
 %package -n compat32-%{name}
 %package -n compat32-%{name}
 Summary:	The Vorbis General Audio Compression Codec.
 Summary:	The Vorbis General Audio Compression Codec.
 Summary(ja):	Vorbis - 汎用オーディオ圧縮コーデック
 Summary(ja):	Vorbis - 汎用オーディオ圧縮コーデック
-Group:		System Environment/Libraries
+Group:		system,legacy
 
 
 %description -n compat32-%{name}
 %description -n compat32-%{name}
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
 Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
@@ -68,6 +76,7 @@ and variable bitrates from 16 to 128 kbps/channel.
 The libvorbis package contains runtime libraries for use in programs
 The libvorbis package contains runtime libraries for use in programs
 that support Ogg Voribs.
 that support Ogg Voribs.
 
 
+
 %description -n compat32-%{name} -l ja
 %description -n compat32-%{name} -l ja
 Ogg Vorbis は完全にオープンで、知的財産権による制約、特許やロイヤリティ
 Ogg Vorbis は完全にオープンで、知的財産権による制約、特許やロイヤリティ
 と関係ない汎用のオーディオ圧縮フォーマットで、チャンネルあたり 16〜128
 と関係ない汎用のオーディオ圧縮フォーマットで、チャンネルあたり 16〜128
@@ -79,8 +88,8 @@ kbps の固定/可変ビットレートのオーディオや音楽用です。
 %package -n compat32-%{name}-devel
 %package -n compat32-%{name}-devel
 Summary:	Development files for Vorbis applications.
 Summary:	Development files for Vorbis applications.
 Summary(ja):	Vorbis アプリケーションの開発用ファイル
 Summary(ja):	Vorbis アプリケーションの開発用ファイル
-Group:		Development/Libraries
-Requires:	compat32-%{name} = %{epoch_num}:%{version}-%{release}
+Group:		programming,legacy
+Requires:	compat32-%{name} = %{epoch}:%{version}-%{release}
 Requires:	compat32-libogg-devel >= %{liboggver}
 Requires:	compat32-libogg-devel >= %{liboggver}
 
 
 %description -n compat32-%{name}-devel
 %description -n compat32-%{name}-devel
@@ -91,34 +100,42 @@ and documentation needed to develop applications with libvorbis.
 このパッケージには、libvorbis を使ったアプリケーションの開発に必要な
 このパッケージには、libvorbis を使ったアプリケーションの開発に必要な
 ヘッダファイル、静的ライブラリ、及びドキュメントが含まれています。
 ヘッダファイル、静的ライブラリ、及びドキュメントが含まれています。
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1
+sed -i "s/-ffast-math//" configure
+sed -i "s/-mcpu=750//" configure
 
 
-perl -p -i -e "s/-O20/%{optflags}/" configure
-perl -p -i -e "s/-ffast-math//" configure
 
 
 %build
 %build
-%configure --with-ogg-libraries=%{_libdir} --disable-static
+%configure --disable-static
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+
 %install
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} docdir=%{_pkgdocdir} install
+
+rm -f %{buildroot}%{_libdir}/lib*.la
+
+%ifnarch x86_64
+rm -rf %{buildroot}%{_pkgdocdir}
+%endif
+
+%check
+make check
 
 
-#rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
 
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
+%ldconfig_scriptlets -n compat32-%{name}
 
 
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -134,6 +151,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/vorbis.m4
 %{_datadir}/aclocal/vorbis.m4
 
 
+%ifarch x86_64
+%files devel-docs
+%{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/doxygen-build.stamp
+%endif
+
 # compat32
 # compat32
 %if %{build_compat32}
 %if %{build_compat32}
 %files -n compat32-%{name}
 %files -n compat32-%{name}
@@ -145,7 +168,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %{_libdir}/*.so
 %{_libdir}/*.so
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7-1
+- new upstream release.
+- dropped Patch0.
+
 * Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6-1
 * Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6-1
 - new upstream release.
 - new upstream release.
 - imported Patch0 from rawhide.
 - imported Patch0 from rawhide.

+ 12 - 6
r/re2c/re2c-vl.spec

@@ -1,15 +1,14 @@
 Summary: Tool for generating C-based recognizers from regular expressions
 Summary: Tool for generating C-based recognizers from regular expressions
 Name: re2c
 Name: re2c
-Version: 1.3
+Version: 2.0.3
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Development/Tools
+Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 License: Public Domain
 License: Public Domain
 URL: https://re2c.org/
 URL: https://re2c.org/
-Source: https://github.com/skvadrik/re2c/releases/download/1.3/re2c-%{version}.tar.xz
-Patch0: CVE-2020-11958.patch
+Source: https://github.com/skvadrik/re2c/releases/download/%{version}/re2c-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -22,6 +21,9 @@ free code that is equal to hand-written code in terms of size, speed and
 quality.
 quality.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %autopatch -p1
 %autopatch -p1
@@ -49,14 +51,18 @@ make tests
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
 %doc CHANGELOG README.md examples/ doc/*
 %doc CHANGELOG README.md examples/ doc/*
-%{_bindir}/re2c
+%{_bindir}/*
 %dir %{_datadir}/re2c
 %dir %{_datadir}/re2c
 %dir %{_datadir}/re2c/stdlib
 %dir %{_datadir}/re2c/stdlib
 %{_datadir}/re2c/stdlib/unicode_categories.re
 %{_datadir}/re2c/stdlib/unicode_categories.re
-%{_mandir}/man1/re2c.1*
+%{_mandir}/man1/*
 
 
 
 
 %changelog
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.0.3-1
+- new upstream release.
+- dropped Patch0: fixed in upstream.
+
 * Thu Apr 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3-1
 * Thu Apr 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3-1
 - new upstream release.
 - new upstream release.
 - added Patch0 to fix CVE-2020-11958.
 - added Patch0 to fix CVE-2020-11958.

+ 27 - 31
v/vorbis-tools/vorbis-tools-vl.spec

@@ -4,34 +4,20 @@
 Summary:	Several Ogg Vorbis Tools
 Summary:	Several Ogg Vorbis Tools
 Summary(ja):	各種 Ogg Vorvis 用ツール
 Summary(ja):	各種 Ogg Vorvis 用ツール
 Name:		vorbis-tools
 Name:		vorbis-tools
-Version:	1.4.0
-Release:	5%{?_dist_release}
-Group:		Applications/Multimedia
-License:	GPLv2
-URL:		http://www.xiph.org/
+Version:	1.4.2
+Release:	1%{?_dist_release}
+Group:		multimedia
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 
+License:	GPLv2
+URL:		https://www.xiph.org/
 Source0:	http://downloads.xiph.org/releases/vorbis/vorbis-tools-%{version}.tar.gz
 Source0:	http://downloads.xiph.org/releases/vorbis/vorbis-tools-%{version}.tar.gz
 Source1:	vorbis-tools-ogg123rc
 Source1:	vorbis-tools-ogg123rc
 
 
-Patch1:		vorbis-tools-1.1.1-include-config.h.patch
-
-Patch2:		vorbis-tools-1.4.0-bz887540.patch
-# http://thread.gmane.org/gmane.comp.multimedia.ogg.vorbis.devel/5729
-Patch3:		vorbis-tools-1.4.0-man-page.patch
-
-# update po files from translationproject.org (#1116650)
-Patch4:		vorbis-tools-1.4.0-bz1116650.patch
-
-# security fixes
-Patch1000: CVE-2014-9638-9639.patch
-# CVE-2014-9640
-# do not use stack variable out of its scope of validity (#1185558)
-Patch1001: vorbis-tools-1.4.0-bz1185558.patch
-Patch1002: CVE-2015-6749.patch
-
-# http://thread.gmane.org/gmane.comp.multimedia.ogg.vorbis.devel/5738
-Patch1003: vorbis-tools-1.4.0-bz1003607.patch
-
+# http://lists.xiph.org/pipermail/vorbis-dev/2021-January/020538.html
+# http://lists.xiph.org/pipermail/vorbis-dev/2013-May/020336.html
+Patch1:		vorbis-tools-1.4.2-man-page.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libvorbis-devel >= 1.0
 BuildRequires:	libvorbis-devel >= 1.0
@@ -40,9 +26,6 @@ BuildRequires:	curl-devel
 BuildRequires:	perl
 BuildRequires:	perl
 Requires:	curl
 Requires:	curl
 
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
 %if %{with_flac}
 %if %{with_flac}
 BuildRequires:	flac-devel >= 1.1.3
 BuildRequires:	flac-devel >= 1.1.3
 %endif
 %endif
@@ -69,12 +52,17 @@ vorbis-tools には、Ogg Vorbis のエンコーダ oggenc と再生ツール og
  - oggdec        : シンプルなコマンドラインデコーダ
  - oggdec        : シンプルなコマンドラインデコーダ
 # - vcut          : vorbis ファイルを分割
 # - vcut          : vorbis ファイルを分割
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %autosetup -p1
 %autosetup -p1
 
 
+
 %build
 %build
-perl -p -i -e "s/-O20/%{optflags}/" configure
-perl -p -i -e "s/-ffast-math//" configure
+# fix FTBFS if "-Werror=format-security" flag is used (#1025257)
+export CFLAGS="$RPM_OPT_FLAGS -Wno-error=format-security"
 %configure \
 %configure \
 %if ! %{with_flac}
 %if ! %{with_flac}
 	--without-flac \
 	--without-flac \
@@ -82,8 +70,8 @@ perl -p -i -e "s/-ffast-math//" configure
 %if ! %{with_speex}
 %if ! %{with_speex}
 	--without-speex
 	--without-speex
 %endif
 %endif
+%make_build
 
 
-make
 
 
 %install
 %install
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
@@ -92,17 +80,25 @@ make
 
 
 %__install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ogg123rc
 %__install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/ogg123rc
 
 
+
 %clean 
 %clean 
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 
 
+
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc AUTHORS COPYING README ogg123/ogg123rc-example
+%license COPYING
+%doc AUTHORS README ogg123/ogg123rc-example
 %config %{_sysconfdir}/ogg123rc
 %config %{_sysconfdir}/ogg123rc
 %{_bindir}/*
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 
 
+
 %changelog
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.2-1
+- dropped all patches.
+- imported Patch1 from rawhide.
+
 * Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-5
 * Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-5
 - replaced Patch1001.
 - replaced Patch1001.
 - imported Patch2-4 and 1003.
 - imported Patch2-4 and 1003.

+ 22 - 10
x/xterm/xterm-vl.spec

@@ -1,17 +1,19 @@
 Summary: Terminal emulator for the X Window System
 Summary: Terminal emulator for the X Window System
 Summary(ja): X ウィンドウシステム用ターミナルエミュレータ
 Summary(ja): X ウィンドウシステム用ターミナルエミュレータ
 Name: xterm
 Name: xterm
-Version: 312
+Version: 366
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-URL: http://dickey.his.com/xterm
-License: MIT
-Group: User Interface/X
+Group: accessories
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
-Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
-Source1: ftp://invisible-island.net/xterm/16colors.txt
+License: MIT
+URL: https://invisible-island.net/xterm/
+Source0: https://invisible-mirror.net/archives/xterm/%{name}-%{version}.tgz
+Source1: https://invisible-mirror.net/archives/xterm/16colors.txt
 
 
 Patch1: xterm-245-resources.patch
 Patch1: xterm-245-resources.patch
-Patch3: xterm-310-man-page_paths.patch
+Patch3: xterm-366-man-page_paths.patch
 Patch4: xterm-286-desktopfile.patch
 Patch4: xterm-286-desktopfile.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -19,9 +21,6 @@ BuildRequires: imake, pkgconfig, ncurses-devel
 #BuildRequires: libutempter-devel
 #BuildRequires: libutempter-devel
 BuildRequires: libXft-devel, libXaw-devel, libXext-devel, desktop-file-utils
 BuildRequires: libXft-devel, libXaw-devel, libXext-devel, desktop-file-utils
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
 %define x11_app_defaults_dir %(pkg-config --variable appdefaultdir xt)
 
 
 %description
 %description
@@ -29,6 +28,10 @@ The xterm program is a terminal emulator for the X Window System. It
 provides DEC VT102 and Tektronix 4014 compatible terminals for
 provides DEC VT102 and Tektronix 4014 compatible terminals for
 programs that can't use the window system directly.
 programs that can't use the window system directly.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
@@ -36,6 +39,7 @@ programs that can't use the window system directly.
 %patch3 -p1 -b .man-page_paths
 %patch3 -p1 -b .man-page_paths
 %patch4 -p1 -b .desktopfile
 %patch4 -p1 -b .desktopfile
 
 
+
 %build
 %build
 %configure \
 %configure \
 	--enable-256-color \
 	--enable-256-color \
@@ -52,6 +56,7 @@ programs that can't use the window system directly.
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -62,9 +67,11 @@ desktop-file-install --vendor="" \
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
 	xterm.desktop
 	xterm.desktop
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
 %doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
@@ -87,7 +94,12 @@ rm -rf $RPM_BUILD_ROOT
 %{x11_app_defaults_dir}/XTerm
 %{x11_app_defaults_dir}/XTerm
 %{x11_app_defaults_dir}/XTerm-color
 %{x11_app_defaults_dir}/XTerm-color
 
 
+
 %changelog
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 366-1
+- new upstream release.
+- updated Patch3.
+
 * Sun Nov 23 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 312-1
 * Sun Nov 23 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 312-1
 - new upstream release
 - new upstream release