updated 6 packages

asciidoc-9.1.0-2

dblatex-0.3.12-1

glib2-2.68.0-1

symlinks-1.7-6

transfig-3.2.8-1

vala-0.48.15-1

a/asciidoc/asciidoc-vl.spec

@@ -2,7 +2,7 @@ Summary: Text based document generation
 Summary(ja): テキストベースのドキュメント生成
 Name: asciidoc
 Version: 9.1.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: office
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -41,7 +41,7 @@ Requires: %{name} = %{version}-%{release}
 Summary:  Support for asciidoc latex output
 Group: publishing
 Requires: %{name} = %{version}-%{release}
-Requires: texlive
+Requires: dblatex
 
 %description latex
 %{summary}.
@@ -109,15 +109,24 @@ rm -f %{buildroot}%{_sysconfdir}/asciidoc/filters/*/*.py[co]
 for l in $(find %{buildroot} -type l); do symlinks -cdov $l; done
 
 
+%pre
+# fix conflict with asciidoc < 9.1.0
+if [ ! -L %{_sysconfdir}/asciidoc/dblatex ]; then
+	rm -rf %{_sysconfdir}/asciidoc/dblatex
+fi
+
+
 %files
 %defattr(-,root,root,0755)
 %license COPYRIGHT
 %doc BUGS.txt CHANGELOG.txt README*
-%config(noreplace) %{_sysconfdir}/asciidoc
+%dir %{_sysconfdir}/asciidoc
+%config(noreplace) %{_sysconfdir}/asciidoc/*
 %{_bindir}/*
 %{_mandir}/man1/*
 %{python3_sitelib}/asciidocapi.py*
 %{_datadir}/asciidoc/
+%exclude %{_sysconfdir}/asciidoc/dblatex
 %exclude %{_sysconfdir}/asciidoc/filters/latex
 %exclude %{_sysconfdir}/asciidoc/filters/music
 %exclude %{_pkgdocdir}/website
@@ -131,12 +140,17 @@ for l in $(find %{buildroot} -type l); do symlinks -cdov $l; done
 %exclude %{_docdir}/%{name}/{COPYRIGHT,README.asciidoc}
 
 %files latex
+%dir %{_sysconfdir}/asciidoc
+%{_sysconfdir}/asciidoc/dblatex
 %dir %{_sysconfdir}/asciidoc/filters/latex
 %{_sysconfdir}/asciidoc/filters/latex/*.py
 %config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
 
 
 %changelog
+* Tue Mar 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.1.0-2
+- fixed conflict with asciidoc < 9.1.0.
+
 * Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.1.0-1
 - new upstream release.
 

d/dblatex/dblatex-vl.spec

@@ -1,49 +1,42 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:		dblatex
-Version:	0.3.7
+Version:	0.3.12
 Release:	1%{?_dist_release}
 Summary:	DocBook to LaTeX/ConTeXt Publishing
-BuildArch:	noarch
-Group:		Applications/Publishing
+Group:		publishing
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	GPLv2+
 URL:		http://dblatex.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-#Source1:        http://docbook.sourceforge.net/release/xsl/current/COPYING
-Source1:        COPYING-docbook-xsl
-Patch0:		dblatex-0.2.7-external-which.patch
-
-##!! ad-hoc patch for no deb
-Patch10:	dblatex-0.3.4-no-deb.patch
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}3-%{version}.tar.bz2
+# http://docbook.sourceforge.net/release/xsl/current/COPYING
+Source1:	COPYING-docbook-xsl
+Patch0:		dblatex-0.3.11-disable-debian.patch
+Patch1:		dblatex-0.3.11-which-shutil.patch
+Patch2:		dblatex-0.3.11-replace-inkscape-by-rsvg.patch
 
+BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  texlive-vtlpkg >= 2013
-BuildRequires:  python-devel 
-BuildRequires:  python-which
-BuildRequires:  libxslt docbook-dtds ImageMagick
+BuildRequires:	python3-devel 
+BuildRequires:	python3-setuptools
+BuildRequires:	libxslt docbook-dtds ImageMagick
 ## Need epstopdf, fig2dev
 BuildRequires:	texlive-collection-fontutils
 BuildRequires:	transfig
-##BuildRequires:  tex(latex)
-##BuildRequires:  tex(xetex)
-BuildRequires:  texlive-common >= 2013
-## appendix.sty, changebar.sty, footmisc.sty, multirow.sty, 
-## overpic.sty, subfigure.sty, titlesec.sty
-BuildRequires:  texlive-collection-latexextra
-## stmaryrd.sty
-BuildRequires:  texlive-collection-mathextra
-BuildRequires:	texlive-collection-htmlxml
+BuildRequires:	texlive >= 2020
+BuildRequires:	texlive-collection-formatsextra
+BuildRequires:	texlive-collection-fontsrecommended
+BuildRequires:	texlive-collection-latexextra
+BuildRequires:	texlive-collection-xetex
 Requires:	libxslt docbook-dtds ImageMagick
-##Requires:       tex(xetex)
-Requires:	texlive-common >= 2013
+Requires:	texlive >= 2020
+Requires:	texlive-collection-formatsextra
+Requires:	texlive-collection-fontsrecommended
 Requires:	texlive-collection-latexextra
+Requires:	texlive-collection-xetex
 Requires:	transfig
-Requires:       texlive-collection-mathextra
-##Requires:	passivetex
-Requires:	texlive-collection-htmlxml
 
-## $ rpm -qf --qf "%{name}\n" $(kpsewhich $(grep "usepackage" $(rpm -ql dblatex | grep sty) | sed -e "s,.*{,," -e "s,}.*$,.sty,")) | sort | uniq
 Requires:	texlive-collection-langcjk texlive-collection-bibtexextra
 
 %description
@@ -59,19 +52,23 @@ Authors:
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .external-which
-%patch10 -p1 -b .no-deb
+%setup -q -n %{name}3-%{version}
+%patch0 -p1 -b .disable-debian
+%patch1 -p1 -b .which-shutil
+%patch2 -p1 -b .rsvg
+
 %__rm -rf lib/contrib
+pathfix%{__default_python3_version}.py -pni "%{__python3} %{py3_shbang_opts}" .
+
 
 %build
-%{__python} setup.py build
+%{__python3} setup.py build
 
 
 %install
-%__rm -rf $RPM_BUILD_ROOT
-#%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-%{__python} setup.py install --root $RPM_BUILD_ROOT
+%{__python3} setup.py install --root $RPM_BUILD_ROOT
+pathfix%{__default_python3_version}.py -pni "%{__python3} %{py3_shbang_opts}" $RPM_BUILD_ROOT%{_bindir}/dblatex
+
 # these are already in tetex-latex:
 for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/ xelatex/; do
   %__rm -rf $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/misc/$file
@@ -97,10 +94,6 @@ done
 touch -r xsl/mathml2/README README-xsltml
 %__cp -p %{SOURCE1} COPYING-docbook-xsl
 
- 
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
 
 %post
 %_tl_touch_run texhash
@@ -120,15 +113,20 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %{_mandir}/man1/dblatex.1*
-%doc COPYRIGHT docs/manual.pdf COPYING-docbook-xsl README-xsltml
-%{python_sitelib}/dbtexmf/
-%{python_sitelib}/dblatex-*.egg-info
+%license COPYRIGHT COPYING-docbook-xsl
+%doc docs/manual.pdf README-xsltml
+%{python3_sitelib}/dbtexmf/
+%{python3_sitelib}/dblatex-*.egg-info
 %{_bindir}/dblatex
 %{_datadir}/dblatex/
 %{_datadir}/texmf/tex/latex/dblatex/
 %dir %{_sysconfdir}/dblatex
 
+
 %changelog
+* Tue Mar 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.12-1
+- new upstream release.
+
 * Wed Jan 20 2016 Munehiro Yamamoto <munepi@vinelinux.org> 0.3.7-1
 - new upstream release
 

g/glib2/glib2-vl.spec

@@ -3,8 +3,8 @@
 
 Summary:        A library of handy utility functions.
 Name:           glib2
-Version:        2.66.7
-Release:        2%{?_dist_release}
+Version:        2.68.0
+Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -21,6 +21,7 @@ BuildRoot:      %{_tmppath}/glib-%{version}-root
 
 BuildRequires: dbus-devel
 BuildRequires: docbook-style-xsl
+BuildRequires: elfutils-libelf-devel
 BuildRequires: gamin-devel
 BuildRequires: libattr-devel
 BuildRequires: libffi-devel
@@ -138,9 +139,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.cache
 rm -rf $RPM_BUILD_ROOT
 
 
-%ldconfig_scriptlets
-%ldconfig_scriptlets -n compat32-%{name}
-
 %transfiletriggerin -- %{_libdir}/gio/modules
 gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
 
@@ -240,6 +238,10 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
 
 
 %changelog
+* Tue Mar 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.68.0-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Mon Mar 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.66.7-2
 - added triggers.
 

s/symlinks/symlinks-vl.spec

@@ -1,8 +1,11 @@
 Summary: A utility which maintains a system's symbolic links
 Name: symlinks
 Version: 1.7
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: Copyright only
 URL: http://ibiblio.org/pub/Linux/utils/file/
 # Upstream maintainer provided tarball, ibiblio no longer allowing uploads
@@ -32,7 +35,10 @@ cp %{SOURCE1} .
 
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) %{build_ldflags}" %{?_smp_mflags}
+make \
+	CFLAGS="%{build_cflags} $(getconf LFS_CFLAGS)" \
+	LDFLAGS="%{build_ldflags}" \
+	%{?_smp_mflags}
 
 
 %install
@@ -50,6 +56,9 @@ install -m 644 symlinks.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
 %changelog
+* Tue Mar 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7-6
+- added Vendor: and Distribution: tag.
+
 * Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7-5
 - initial build for Vine Linux.
 

t/transfig/transfig-vl.spec

@@ -1,84 +1,72 @@
-%define ver 3.2.5e
-
 Summary: A utility for converting FIG files (made by xfig) to other formats.
 Summary(ja): Xfig で作った FIG ファイル変換ユーティリティ
 Name: transfig
-Version: %{ver}
+Version: 3.2.8
 Release: 1%{?_dist_release}
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: MIT
-Group: Applications/Graphics
 URL: http://www.xfig.org/
+Source: http://downloads.sourceforge.net/mcj/fig2dev-%{version}.tar.xz
+%{?nosrc:NoSource: 0}
 
-Source: http://downloads.sourceforge.net/mcj/%{name}.%{ver}.tar.gz
-Patch0: transfig-3.2.5-optflags.patch
-Patch5: transfig-3.2.5-modularX.patch
-Patch6: transfig-3.2.5-bitmap.patch
-Patch10: transfig-3.2.5-buildfix.patch
-Patch11: transfig-3.2.5d-bz1037365.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libXpm-devel
+BuildRequires:  ghostscript
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libXpm-devel
-BuildRequires: libpng-devel >= 1.2.5
-BuildRequires: imake
-%{?nosrc:NoSource:     0}
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+Requires:       ghostscript
+Requires:       bc
+Requires:       netpbm-progs
 
 %description
 TransFig is a set of tools for creating TeX documents with graphics
 which are portable, in the sense that they can be printed in a wide
 variety of environments.
 
-%prep
-%setup -q -n %{name}.%{version}
-%patch0 -p1 -b .optflags
-%patch5 -p1 -b .modularX
-%patch6 -p1 -b .bitmap
-%patch10 -p1 -b .buildfix
-%patch11 -p1
 
-# fix source permissions
-find -type f -exec chmod -x {} \;
+%debug_package
 
-# remove garbage
-rm -f doc/manual/Makefile.orig doc/fig2dev.1.orig
 
-%build
-xmkmf
-(cd fig2dev; xmkmf ; cd dev ;xmkmf)
-(cd transfig ; xmkmf)
-make
+%prep
+%setup -q -n fig2dev-%{version}
+%autopatch -p1
+autoreconf -i
+# Fix the manpage not being in UTF-8
+iconv -f ISO-8859-15 -t UTF-8 man/fig2dev.1.in -o fig2dev.1.in.new
+touch -r man/fig2dev.1.in fig2dev.1.in.new
+mv fig2dev.1.in.new man/fig2dev.1.in
 
 
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+%build
+%configure --enable-transfig
+%make_build
 
-make DESTDIR=%{buildroot} \
-     MANPATH=%{_mandir} FIG2DEV_LIBDIR=%{_datadir}/fig2dev \
-     install install.man
 
-# fig2ps2tex{,.sh} are equivalent, use the sh one
-mv %{buildroot}%{_bindir}/fig2ps2tex.sh %{buildroot}%{_bindir}/fig2ps2tex
-ln -s fig2ps2tex %{buildroot}%{_bindir}/fig2ps2tex.sh
+%install
+%make_install
 
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc CHANGES NOTES README LATEX.AND.XFIG
+%doc CHANGES transfig/doc/manual.pdf
 %{_bindir}/transfig
 %{_bindir}/fig2dev
 %{_bindir}/fig2ps2tex
-%{_bindir}/fig2ps2tex.sh
 %{_bindir}/pic2tpic
 %{_mandir}/man1/*
-%{_datadir}/xfig
 %{_datadir}/fig2dev
 
+
 %changelog
+* Tue Mar 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.8-1
+- new upstream release.
+- dropped all patches.
+
 * Tue Oct  7 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.5e-1
 - updated to 3.2.5e
 - added Patch11 from Fedora

v/vala/vala-vl.spec

@@ -6,7 +6,7 @@ Summary(ja):    GNOME 用のモダンなプログラミング言語
 
 Name:           vala
 # LTS 0.48
-Version:        0.48.13
+Version:        0.48.15
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -17,14 +17,18 @@ License:        LGPLv2+ and BSD
 URL:            https://wiki.gnome.org/Projects/Vala
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 Source0:        https://download.gnome.org/sources/vala/%{shortver}/vala-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	glib2-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  libxslt
 BuildRequires:  graphviz-devel
+Requires:       %{name}-libs = %{version}-%{release}
+Obsoletes:      %{name}-tools < 0.48.15
+Provides:       %{name}-tools = %{version}-%{release}
+Provides:       vala(api) = %{api_ver}
 
 %description
 Vala is a new programming language that aims to bring modern programming
@@ -42,41 +46,37 @@ The syntax of Vala is similar to C#, modified to better fit the GObject
 type system.
 
 
-%package        devel
-Summary:        Development files for %{name}
-Summary(ja):    %{name} の開発用ファイル
-Group:          programming
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+%package        libs
+Summary:        Vala compiler library
+Summary(ja):    Valaコンパイラの共有ライブラリ
+Group:          system,programming
+Provides:       libvala = %{version}-%{release}
 
-%description    devel
+%description    libs
 Vala is a new programming language that aims to bring modern programming
 language features to GNOME developers without imposing any additional
 runtime requirements and without using a different ABI compared to
 applications and libraries written in C.
 
-This package contains development files for %{name}. This is not necessary for
-using the %{name} compiler.
+This package contains the shared libvala library.
 
 
-%package        tools
-Summary:        Tools for creating projects and bindings for %{name}
-Summary(ja):    %{name} のプロジェクト作成やバインディングのためのツール集
+%package        devel
+Summary:        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          programming
-License:        LGPLv2+
-Requires:       %{name} = %{version}-%{release}
-Requires:       gnome-common intltool libtool
-Provides:       %{name}-vapigen = %{version}-%{release}
-Obsoletes:      %{name}-vapigen < %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       pkgconfig
+Provides:       libvala-devel = %{version}-%{release}
 
-%description    tools
+%description    devel
 Vala is a new programming language that aims to bring modern programming
 language features to GNOME developers without imposing any additional
 runtime requirements and without using a different ABI compared to
 applications and libraries written in C.
 
-This package contains tools to generate Vala projects, as well as API bindings
-from existing C libraries, allowing access from Vala programs.
+This package contains development files for %{name}. This is not necessary for
+using the %{name} compiler.
 
 
 %package        doc
@@ -148,12 +148,6 @@ find %{buildroot}%{_libdir} -type f -name 'lib*.la' | xargs rm -f
 %check
 make check
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%ldconfig_scriptlets
-
 
 %files
 %defattr(-,root,root,-)
@@ -163,30 +157,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/valac
 %{_bindir}/vala-%{api_ver}
 %{_bindir}/valac-%{api_ver}
-%{_datadir}/vala-%{api_ver}
+%{_bindir}/vala-gen-introspect
+%{_bindir}/vala-gen-introspect-%{api_ver}
+%{_bindir}/vapigen
+%{_bindir}/vapigen-%{api_ver}
+%{_datadir}/aclocal/vala.m4
+%{_datadir}/aclocal/vapigen.m4
 %{_datadir}/vala
-%{_libdir}/libvala-%{api_ver}.so.*
+%{_datadir}/vala-%{api_ver}
+%{_libdir}/pkgconfig/vapigen.pc
+%{_libdir}/pkgconfig/vapigen-%{api_ver}.pc
+%{_libdir}/vala-%{api_ver}
 %{_mandir}/*/valac*
+%{_mandir}/*/*gen*
+
+%files libs
+%{_libdir}/libvala-%{api_ver}.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/vala-%{api_ver}
 %{_libdir}/libvala-%{api_ver}.so
 %{_libdir}/pkgconfig/libvala-%{api_ver}.pc
-%{_datadir}/aclocal/vala.m4
-%{_datadir}/aclocal/vapigen.m4
-%{_libdir}/pkgconfig/vapigen.pc
-%{_libdir}/pkgconfig/vapigen-%{api_ver}.pc
-%{_datadir}/vala/Makefile.vapigen
-
-%files tools
-%defattr(-,root,root,-)
-%{_bindir}/vala-gen-introspect
-%{_bindir}/vapigen
-%{_bindir}/vala-gen-introspect-%{api_ver}
-%{_bindir}/vapigen-%{api_ver}
-%{_libdir}/vala-%{api_ver}
-%{_mandir}/*/*gen*
 
 %files doc
 %defattr(-,root,root,-)
@@ -207,6 +199,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.48.15-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+- unified vala-tools into main package.
+- separated libvala as vala-libs.
+
 * Thu Feb 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.48.13-1
 - new upstream release.