|
|
@@ -1,27 +1,23 @@
|
|
|
%bcond_without test
|
|
|
|
|
|
-%define extraver a
|
|
|
+%define extraver a
|
|
|
+%define _infodir /usr/share/info
|
|
|
+
|
|
|
+Summary: Tools needed to create Texinfo format documentation files.
|
|
|
+Summary(ja): Texinfo ドキュメントを作成する為に使うツール群
|
|
|
+Name: texinfo
|
|
|
+Version: 6.8
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+Group: publishing
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+Packager: daisuke
|
|
|
+
|
|
|
+License: GPLv3+
|
|
|
+URL: https://www.gnu.org/software/texinfo/
|
|
|
+Source0: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
|
|
|
+Source1: info-dir
|
|
|
|
|
|
-%define _infodir /usr/share/info
|
|
|
-
|
|
|
-Summary: Tools needed to create Texinfo format documentation files.
|
|
|
-Summary(ja): Texinfo ドキュメントを作成する為に使うツール群
|
|
|
-
|
|
|
-Name: texinfo
|
|
|
-Version: 6.7
|
|
|
-Release: 1%{?_dist_release}
|
|
|
-Group: Applications/Publishing
|
|
|
-
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
-Packager: daisuke
|
|
|
-
|
|
|
-License: GPLv3+
|
|
|
-URL: https://www.gnu.org/software/texinfo/
|
|
|
-Source0: https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
|
|
|
-Source1: info-dir
|
|
|
-
|
|
|
-Patch0: texinfo-4.12-zlib.patch
|
|
|
# Patch1: this is needed just for koji/mock, all tests pass fine in local build
|
|
|
Patch1: texinfo-6.0-disable-failing-info-test.patch
|
|
|
# Patch2: rhbz#1348671, because of OSTree
|
|
|
@@ -32,11 +28,13 @@ Patch3: info-6.5-sync-fix-info-dir.patch
|
|
|
Patch4: texinfo-6.5-fix-info-dir.patch
|
|
|
# Patch5: fixes issues detected by static analysis
|
|
|
Patch5: texinfo-6.5-covscan-fixes.patch
|
|
|
+# Patch5: undos change done in gnulib that causes build to fail
|
|
|
+# https://lists.gnu.org/r/bug-gnulib/2021-03/msg00066.html
|
|
|
+Patch6: texinfo-6.8-undo-gnulib-nonnul.patch
|
|
|
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
Requires(post): install-info
|
|
|
Requires(preun): install-info
|
|
|
-Prefix: %{_prefix}
|
|
|
-Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: autoconf libtool ncurses-devel zlib-devel help2man
|
|
|
|
|
|
# Texinfo perl packages are not installed in default perl library dirs
|
|
|
@@ -47,7 +45,6 @@ BuildRequires: autoconf libtool ncurses-devel zlib-devel help2man
|
|
|
|
|
|
%define __spec_install_post /usr/lib/rpm/brp-strip \; /usr/lib/rpm/brp-strip-comment-note \; rm -f
|
|
|
|
|
|
-
|
|
|
%description
|
|
|
Texinfo is a documentation system that can produce both online
|
|
|
information and printed output from a single source file. The GNU
|
|
|
@@ -71,7 +68,7 @@ GNU Project では，殆どのドキュメントでこの Texinfo フォーマ
|
|
|
%package -n info
|
|
|
Summary: A stand-alone TTY-based reader for GNU texinfo documentation.
|
|
|
Summary(ja): TTY ベースのスタンドアロン GNU texinfo ドキュメントリーダ
|
|
|
-Group: System Environment/Base
|
|
|
+Group: system
|
|
|
# By making info prereq bash, other packages which have triggers based on
|
|
|
# info don't run those triggers until bash is in place as well. This is an
|
|
|
# ugly method of doing it (triggers which fire on set intersection would
|
|
|
@@ -94,7 +91,7 @@ GNU Project では殆どのドキュメントに texinfo 形式を採用して
|
|
|
%package -n install-info
|
|
|
Summary: info file installer
|
|
|
Summary(ja): info ファイルのインストーラー
|
|
|
-Group: System Environment/Base
|
|
|
+Group: system
|
|
|
Conflicts: info < 4.0b-3vl2
|
|
|
Requires: gzip, bzip2
|
|
|
|
|
|
@@ -104,18 +101,22 @@ info file installer.
|
|
|
%description -n install-info -l ja
|
|
|
info ファイルのインストーラーです．
|
|
|
|
|
|
+
|
|
|
+#debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%autosetup -p1
|
|
|
|
|
|
-%build
|
|
|
|
|
|
+%build
|
|
|
%configure \
|
|
|
--mandir=%{_mandir} \
|
|
|
--infodir=%{_infodir} \
|
|
|
--enable-perl-xs=no
|
|
|
-make %{?_smp_mflags}
|
|
|
|
|
|
-make -C util LIBS=%{_libdir}/libz.a
|
|
|
+make %{?_smp_mflags}
|
|
|
+#make -C util LIBS=%{_libdir}/libz.a
|
|
|
|
|
|
|
|
|
%install
|
|
|
@@ -189,7 +190,6 @@ fi
|
|
|
%{_mandir}/man1/texi2pdf.1*
|
|
|
%{_mandir}/man1/texindex.1*
|
|
|
%{_mandir}/man5/texinfo.5*
|
|
|
-
|
|
|
|
|
|
%files -n info
|
|
|
%defattr(-,root,root)
|
|
|
@@ -197,7 +197,6 @@ fi
|
|
|
#%config(noreplace) %verify(not md5 size mtime) /etc/info-dir
|
|
|
#%config(noreplace) %{_infodir}/dir
|
|
|
%license COPYING
|
|
|
-%doc info/README
|
|
|
%{_bindir}/info
|
|
|
#{_bindir}/infokey
|
|
|
#{_infodir}/info.info*
|
|
|
@@ -206,7 +205,6 @@ fi
|
|
|
#{_mandir}/man1/infokey.1*
|
|
|
%{_mandir}/man5/info.5*
|
|
|
|
|
|
-
|
|
|
%files -n install-info
|
|
|
%defattr(-,root,root)
|
|
|
%license COPYING
|
|
|
@@ -217,6 +215,12 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jul 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.8-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Patch0.
|
|
|
+- updated Patch5.
|
|
|
+- imported Patch6 from rawhide.
|
|
|
+
|
|
|
* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.7-1
|
|
|
- new upstream release.
|
|
|
|
