Browse Source

python-3.8.5 and related packages.

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12469 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 1 year ago
parent
commit
1474851b0a
82 changed files with 3476 additions and 1536 deletions
  1. 16 12
      C/Cython/Cython-vl.spec
  2. 15 11
      P/PyYAML/PyYAML-vl.spec
  3. 20 10
      a/actdiag/actdiag-vl.spec
  4. 12 9
      a/authconfig/authconfig-vl.spec
  5. 20 10
      b/blockdiag/blockdiag-vl.spec
  6. 19 13
      d/dbus-python3/dbus-python3-vl.spec
  7. 10 5
      f/fail2ban/fail2ban-vl.spec
  8. 15 7
      g/gdb/gdb-vl.spec
  9. 5 2
      g/gnome-tweaks/gnome-tweaks-vl.spec
  10. 16 10
      g/gobject-introspection/gobject-introspection-vl.spec
  11. 13 4
      g/gom/gom-vl.spec
  12. 18 8
      g/gpgme/gpgme-vl.spec
  13. 162 86
      h/hplip/hplip-vl.spec
  14. 86 42
      l/lirc/lirc-vl.spec
  15. 14 6
      lib/liba/libappstream-glib/libappstream-glib-vl.spec
  16. 9 1
      lib/libb/libblockdev/libblockdev-vl.spec
  17. 15 5
      lib/libb/libbytesize/libbytesize-vl.spec
  18. 6 3
      lib/libp/libpeas/libpeas-vl.spec
  19. 28 26
      lib/libt/libtdb/libtdb-vl.spec
  20. 28 14
      lib/libx/libxml2/libxml2-vl.spec
  21. 6 5
      m/meson/meson-vl.spec
  22. 59 100
      n/numpy/numpy-vl.spec
  23. 26 16
      n/nwdiag/nwdiag-vl.spec
  24. 24 21
      o/opencv/opencv-vl.spec
  25. 10 46
      p/pycairo/pycairo-vl.spec
  26. 15 7
      p/pygobject3/pygobject3-vl.spec
  27. 29 21
      p/pyparsing/pyparsing-vl.spec
  28. 11 9
      p/pyparted/pyparted-vl.spec
  29. 18 13
      p/python-asn1crypto/python-asn1crypto-vl.spec
  30. 21 16
      p/python-babel/python-babel-vl.spec
  31. 21 9
      p/python-cffi/python-cffi-vl.spec
  32. 20 22
      p/python-chardet/python-chardet-vl.spec
  33. 13 13
      p/python-cryptography/python-cryptography-vl.spec
  34. 39 44
      p/python-cups/python-cups-vl.spec
  35. 24 13
      p/python-dateutil/python-dateutil-vl.spec
  36. 20 23
      p/python-dns/python-dns-vl.spec
  37. 34 51
      p/python-docutils/python-docutils-vl.spec
  38. 17 10
      p/python-funcparserlib/python-funcparserlib-vl.spec
  39. 16 8
      p/python-idna/python-idna-vl.spec
  40. 23 11
      p/python-imagesize/python-imagesize-vl.spec
  41. 212 0
      p/python-inotify/python-inotify-vl.spec
  42. 9 6
      p/python-ipaddress/python-ipaddress-vl.spec
  43. 38 48
      p/python-jinja2/python-jinja2-vl.spec
  44. 34 35
      p/python-lxml/python-lxml-vl.spec
  45. 23 25
      p/python-markupsafe/python-markupsafe-vl.spec
  46. 25 17
      p/python-nose/python-nose-vl.spec
  47. 16 11
      p/python-packaging/python-packaging-vl.spec
  48. 14 7
      p/python-pillow/python-pillow-vl.spec
  49. 78 23
      p/python-pip/python-pip-vl.spec
  50. 25 23
      p/python-pycparser/python-pycparser-vl.spec
  51. 13 12
      p/python-pycurl/python-pycurl-vl.spec
  52. 18 25
      p/python-pygments/python-pygments-vl.spec
  53. 13 11
      p/python-pysocks/python-pysocks-vl.spec
  54. 44 18
      p/python-qt5/python-qt5-vl.spec
  55. 20 15
      p/python-requests/python-requests-vl.spec
  56. 26 72
      p/python-setuptools/python-setuptools-vl.spec
  57. 14 7
      p/python-six/python-six-vl.spec
  58. 19 13
      p/python-snowballstemmer/python-snowballstemmer-vl.spec
  59. 16 11
      p/python-sphinx-theme-alabaster/python-sphinx-theme-alabaster-vl.spec
  60. 64 165
      p/python-sphinx/python-sphinx-vl.spec
  61. 119 0
      p/python-sphinxcontrib-applehelp/python-sphinxcontrib-applehelp-vl.spec
  62. 118 0
      p/python-sphinxcontrib-devhelp/python-sphinxcontrib-devhelp-vl.spec
  63. 119 0
      p/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp-vl.spec
  64. 119 0
      p/python-sphinxcontrib-qthelp/python-sphinxcontrib-qthelp-vl.spec
  65. 124 0
      p/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml-vl.spec
  66. 15 22
      p/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport-vl.spec
  67. 19 12
      p/python-sqlalchemy/python-sqlalchemy-vl.spec
  68. 10 5
      p/python-urllib3/python-urllib3-vl.spec
  69. 21 19
      p/python-webcolors/python-webcolors-vl.spec
  70. 93 22
      p/python-wheel/python-wheel-vl.spec
  71. 25 11
      p/python-whoosh/python-whoosh-vl.spec
  72. 313 0
      p/python2-dns/python2-dns-vl.spec
  73. 166 0
      p/python2-pycairo/python2-pycairo-vl.spec
  74. 222 0
      p/python2-setuptools/python2-setuptools-vl.spec
  75. 162 64
      p/python3/python3-vl.spec
  76. 28 15
      p/pytz/pytz-vl.spec
  77. 6 3
      s/samba/samba-vl.spec
  78. 19 13
      s/seqdiag/seqdiag-vl.spec
  79. 19 9
      s/sip/sip-vl.spec
  80. 23 32
      s/system-config-printer/system-config-printer-vl.spec
  81. 14 8
      t/tbb/tbb-vl.spec
  82. 28 15
      w/wireshark/wireshark-vl.spec

+ 16 - 12
C/Cython/Cython-vl.spec

@@ -1,21 +1,22 @@
 Summary:        A language for writing Python extension modules
 Summary(ja):    Python 拡張モジュールを簡単に作成するためのプログラミング言語
 Name:           Cython
-Version:        0.29.13
+Version:        0.29.21
 Release:        1%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          Development/Languages
 License:        Apache
-URL:            http://cython.org/
-Source0:        http://cython.org/release/%{name}-%{version}.tar.gz
+URL:            https://cython.org/
+Source0:        https://github.com/cython/cython/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:	python-devel
-BuildRequires:	python-setuptools
 BuildRequires:	python-rpm-macros
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
+BuildRequires:	python-devel
+BuildRequires:	python-setuptools
+BuildRequires:	python2-rpm-macros
 
 %description
 Cython is a language that makes writing C extensions for the Python language as easy as Python itself. Cython is based on the well-known Pyrex, but supports more cutting edge functionality and optimizations.
@@ -30,7 +31,7 @@ This makes Cython the ideal language for wrapping external C libraries, and for
 %package -n python3-Cython
 Summary:        A language for writing Python extension modules
 Summary(ja):    Python 拡張モジュールを簡単に作成するためのプログラミング言語
-Group:          Development/Languages
+Group:          programming
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-rpm-macros
@@ -46,16 +47,16 @@ This makes Cython the ideal language for wrapping external C libraries, and for
 
 
 %prep
-%setup -q
+%setup -q -n cython-%{version}
 
 %build
-%{py_build}
+%{py2_build}
 %{py3_build}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{py_install}
+%{py2_install}
 %{py3_install}
 
 
@@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.29.21-1
+- new upstream release.
+
 * Fri Oct 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.29.13-1
 - new upstream release.
 

+ 15 - 11
P/PyYAML/PyYAML-vl.spec

@@ -1,19 +1,19 @@
 Name:           PyYAML
-Version:        5.1.2
+Version:        5.3.1
 Release:        1%{?_dist_release}
 Summary:        YAML parser and emitter for Python
-
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Group:          Development/Libraries
 License:        MIT
 URL:            https://github.com/yaml/pyyaml
-Source0:        https://github.com/yaml/pyyaml/archive/%{name}-%{version}.tar.gz
+Source0:        https://github.com/yaml/pyyaml/archive/%{version}.tar.gz#/pyyaml-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libyaml-devel
-BuildRequires:  python-devel, python-setuptools, python-rpm-macros
+BuildRequires:  python-rpm-macros
+BuildRequires:  python-devel, python-setuptools, python2-rpm-macros
 BuildRequires:  python3-devel, python3-setuptools, python3-rpm-macros
 BuildRequires:  python3-Cython
 
@@ -33,6 +33,7 @@ configuration files to object serialization and persistance.
 
 %package -n python3-pyyaml
 Summary:        %summary
+Group:          programming
 Provides:       python3-yaml = %{version}-%{release}
 Provides:       python3-yaml%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-pyyaml}
@@ -55,28 +56,28 @@ configuration files to object serialization and persistance.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n pyyaml-%{version}
 chmod a-x examples/yaml-highlight/yaml_hl.py
 
 # remove pre-generated file
-rm -rf ext/_yaml.c
+rm -f ext/_yaml.c
 
 
 %build
 %py3_build
 
 # py_build reuses Cython output from py3_build
-%py_build
+%py2_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%py_install
+%py2_install
 %py3_install
 
 
 %check
-%{__python} setup.py test
+%{__python2} setup.py test
 %{__python3} setup.py test
 
 
@@ -88,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %license LICENSE
 %doc CHANGES README examples
-%{python_sitearch}/*
+%{python2_sitearch}/*
 
 %files -n python3-pyyaml
 %license LICENSE
@@ -97,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.1-1
+- new upstream release.
+
 * Wed Oct 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.1.2-1
 - new upstream release.
 - added python3 support.

+ 20 - 10
a/actdiag/actdiag-vl.spec

@@ -1,27 +1,28 @@
 Summary: simple activity-diagram image generator
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
 Name: actdiag
-Version: 0.5.4
+Version: 2.0.0
 Release: 1%{?_dist_release}
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
 
 License: Apache License 2.0
-Group: Applications/Text
 URL: http://blockdiag.com/ja/actdiag/
 Source0: https://pypi.python.org/packages/source/a/actdiag/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
 Requires: blockdiag
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 actdiag generate activity-diagram image file from spec-text file.
 
@@ -29,6 +30,7 @@ actdiag generate activity-diagram image file from spec-text file.
 %package -n python3-actdiag
 Summary: simple activity-diagram image generator
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
+Group: graphics
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
@@ -42,18 +44,22 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %prep
 %setup -q
 
+
 %build
-%py_build
+%py2_build
 %py3_build
 
+
 %install
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 
+
 %clean
 %__rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
 %license LICENSE
@@ -71,7 +77,11 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %{python3_sitelib}/actdiag*
 %{python3_sitelib}/__pycache__/*
 
+
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.0-1
+- new upstream release.
+
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.4-1
 - new upstream release.
 - added python3 support.

+ 12 - 9
a/authconfig/authconfig-vl.spec

@@ -2,15 +2,13 @@ Summary: Command line tool for setting up authentication from network services
 Summary(ja): ネットワークサービスからの認証を設定するためのコマンドラインツール
 Name: authconfig
 Version: 7.0.1
-Release: 2%{?_dist_release}
-License: GPLv2+
-ExclusiveOS: Linux
-Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-URL: https://pagure.io/authconfig
+Release: 3%{?_dist_release}
+Group: admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: GPLv2+
+URL: https://pagure.io/authconfig
 Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 
 # fedora patches
@@ -26,14 +24,16 @@ Patch1000: authconfig-7.0.1-elogind.patch
 # stop warning flood by tempfile in python3.5
 Patch1001: authconfig-7.0.1-fix-temp-warning.patch
 
-Conflicts: samba-common < 3.0, samba-client < 3.0
-Conflicts: nss_ldap < 254
-Obsoletes: authconfig-gtk < 7.0.0
+ExclusiveOS: Linux
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
 BuildRequires: python3-devel
 BuildRequires: intltool, gettext
 Requires: pam
 Requires: openssl
+Conflicts: samba-common < 3.0, samba-client < 3.0
+Conflicts: nss_ldap < 254
+Obsoletes: authconfig-gtk < 7.0.0
 
 %description 
 Authconfig is a command line utility which can configure a workstation
@@ -110,6 +110,9 @@ fi
 %attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-3
+- rebuilt with python-3.8.
+
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-2
 - updated Patch100.
 

+ 20 - 10
b/blockdiag/blockdiag-vl.spec

@@ -1,29 +1,30 @@
 Summary: simple block-diagram image generator
 Summary(ja): シンプルなテキストからブロック図を生成するツール
 Name: blockdiag
-Version: 1.5.4
+Version: 2.0.1
 Release: 1%{?_dist_release}
-Group: Applications/Text
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
 
 License: Apache License 2.0
 URL: http://blockdiag.com/ja/
 Source0: https://pypi.python.org/packages/source/b/blockdiag/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
 Requires: python-pillow
 Requires: python-funcparserlib >= 0.3.4
 Requires: python-webcolors
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 blockdiag generate block-diagram image file from spec-text file.
 
@@ -31,6 +32,7 @@ blockdiag generate block-diagram image file from spec-text file.
 %package -n python3-blockdiag
 Summary: simple block-diagram image generator
 Summary(ja): シンプルなテキストからブロック図を生成するツール
+Group: graphics
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
@@ -42,21 +44,26 @@ Requires: python3-webcolors
 %description -n python3-blockdiag
 blockdiag generate block-diagram image file from spec-text file.
 
+
 %prep
 %setup -q
 
+
 %build
-%py_build
+%py2_build
 %py3_build
 
+
 %install
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 
+
 %clean
 %__rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
 %license LICENSE
@@ -75,6 +82,9 @@ blockdiag generate block-diagram image file from spec-text file.
 %{python3_sitelib}/__pycache__/*
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.1-1
+- new upstream release.
+
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.4-1
 - new upstream release.
 - added python3 support.

+ 19 - 13
d/dbus-python3/dbus-python3-vl.spec

@@ -1,27 +1,26 @@
-%{!?python3_sitearch: %define python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
 %define dbus_glib_version 	0.70
 %define dbus_version 		1.6
-%define pkg_release		3%{?_dist_release}
 
 Name:		dbus-python3
 Summary:	D-Bus Python3 Bindings 
 Summary(ja):	D-Bus Python3 バインディング
-Version:	1.2.0
-Release:	%{pkg_release}
+Group:		system
+Version:	1.2.16
+Release:	1%{?_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
-Group:		System Environment/Libraries
 License:	MIT
-URL:		http://www.freedesktop.org/software/dbus/
-
-Source0:	http://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
+URL:		https://www.freedesktop.org/software/dbus/
+Source0:	https://dbus.freedesktop.org/releases/dbus-python/dbus-python-%{version}.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	dbus-devel >= %{dbus_version}
 BuildRequires:	dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:	python3-devel
+BuildRequires:	python3-rpm-macros
 Requires:	python3
+Provides:	python3-dbus = %{version}-%{release}
 
 %description
 D-Bus python3 bindings for use with python programs.   
@@ -33,6 +32,7 @@ D-Bus を python3 プログラムから使う為のバインディングです
 %prep
 %setup -q -n dbus-python-%{version}
 
+
 %build
 %configure PYTHON=/usr/bin/python3
 %{__make} %{?_smp_mflags}
@@ -54,14 +54,20 @@ rm -f ${RPM_BUILD_ROOT}%{_docdir}/dbus-python/*
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog README NEWS
+%license COPYING
+%doc ChangeLog README NEWS
 %{python3_sitearch}/*.so
-%{python3_sitelib}/dbus/*.py*
-%{python3_sitelib}/dbus/mainloop/*.py*
+%dir %{python3_sitelib}/dbus
+%{python3_sitelib}/dbus/*
+
 
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.16-1
+- new upstream release.
+
 * Tue Jun 28 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-3
 - rebuild with python3-3.5.2
 

+ 10 - 5
f/fail2ban/fail2ban-vl.spec

@@ -1,13 +1,13 @@
 %bcond_with systemd
 %bcond_with tests
 
-%global py2to3 /usr/bin/2to3-3.5
+%global py2to3 /usr/bin/2to3-3.8
 
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Version: 0.11.1
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Daemons
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -31,12 +31,13 @@ Patch5: https://patch-diff.githubusercontent.com/raw/fail2ban/fail2ban/pull/2605
 #Patch6: https://patch-diff.githubusercontent.com/raw/fail2ban/fail2ban/pull/2651.patch
 #Patch7: https://github.com/fail2ban/fail2ban/commit/343ec1cdd296530f331637c725bd2bb0549e01e6.patch
 
+BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-setuptools
-BuildArch: noarch
-Requires: iptables, tcp_wrappers
+Requires: iptables, ipset
+#Requires: tcp_wrappers
 Requires: python3-inotify
 %if %{with systemd}
 %{?systemd_requires}
@@ -111,6 +112,7 @@ export LANG=ja_JP.UTF-8
 %{__python3} bin/fail2ban-testcases --verbosity=2 --no-network
 %endif
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -176,6 +178,9 @@ fi
 
 
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.11.1-2
+- rebuilt with python-3.8.
+
 * Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.11.1-1
 - new upstream release.
 - added systemd support (disabled as default).

+ 15 - 7
g/gdb/gdb-vl.spec

@@ -1,21 +1,22 @@
 Summary: A GNU source-level debugger for C, C++ and other languages.
 Summary(ja): C, C++ その他の言語用 GNU ソースレベルデバッガ
 Name: gdb
-Version: 9.1
+Version: 9.2
 Release: 1%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPL
-Group: Development/Debuggers
+URL: https://www.gnu.org/software/gdb/
 Source: https://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.xz
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-URL: http://sources.redhat.com/gdb/
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo expat-devel
 BuildRequires: python3-devel python3-rpm-macros
 BuildRequires: zlib-devel
 Requires: install-info
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
 and other languages, by executing them in a controlled fashion and
@@ -25,9 +26,11 @@ printing their data.
 GDB (GNU デバッガ) は C, C++ その他の言語で書かれたプログラムのデバッグに
 使うツールです.プログラムの実行を制御し,データを出力することができます.
 
+
 %prep
 %setup -q 
 
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 rm -fr dejagnu tcl expect 
@@ -44,6 +47,7 @@ cd build
 make %{?_smp_mflags}
 make %{?_smp_mflags} info
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 cd build
@@ -63,6 +67,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/lib{bfd*,opcodes*}
 rm -f $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/{bfd.mo,opcodes.mo}
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -120,6 +125,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.2-1
+- new upstream release.
+
 * Fri Mar 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.1-1
 - new upstream release.
 

+ 5 - 2
g/gnome-tweaks/gnome-tweaks-vl.spec

@@ -1,8 +1,9 @@
 Summary:	Graphical interface for advanced GNOME 3 settings
 Summary(ja):	GNOME3の上級設定を行うためのグラフィカルインターフェイス
 Name:		gnome-tweaks
+Group:		desktop-gnome
 Version:	3.34.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
@@ -37,7 +38,6 @@ Requires:       libsoup
 Requires:       mutter
 Requires:       pango
 Requires:       python3-pygobject
-	
 
 Obsoletes:	gnome-tweak-tool < 3.27
 Provides:	gnome-tweak-tool = %{version}-%{release}
@@ -110,6 +110,9 @@ fi
 
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.34.0-2
+- rebuilt with python-3.8.
+
 * Wed Aug 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.34.0-1
 - new upstream release.
 

+ 16 - 10
g/gobject-introspection/gobject-introspection-vl.spec

@@ -1,13 +1,14 @@
+Summary:        Introspection system for GObject-based libraries
 Name:           gobject-introspection
 Version:        1.64.1
-Release:        1%{?_dist_release}
-Summary:        Introspection system for GObject-based libraries
+Release:        2%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          Development/Libraries
 License:        GPLv2+, LGPLv2+, MIT
 URL:            http://live.gnome.org/GObjectIntrospection
-
-%define major_minor %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%define         major_minor %(echo %{version} | sed -e 's/\.[0-9]*$//')
 Source0:        https://ftp.gnome.org/pub/gnome/sources/%{name}/%{major_minor}/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -35,19 +36,17 @@ BuildRequires:  meson
 
 Requires:       python3-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 GObject Introspection can scan C header and source files in order to
 generate introspection "typelib" files.  It also provides an API to examine
 typelib files, useful for creating language bindings among other
 things.
 
+
 %package devel
 Summary: Libraries and headers for gobject-introspection
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %name = %{version}-%{release}
 Requires: glib2-devel
 Requires: libffi-devel
@@ -57,9 +56,11 @@ Obsoletes: gir-repository-devel < 0.6.6
 %description devel
 Libraries and headers for gobject-introspection
 
+
 %prep
 %setup -q
 
+
 %build
 %meson \
 	-Ddoctool=disabled \
@@ -76,13 +77,15 @@ rm -rf $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -108,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.gz
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.64.1-2
+- rebuilt wirh python-3.8.
+
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.64.1-1
 - new upstream release.
 

+ 13 - 4
g/gom/gom-vl.spec

@@ -1,7 +1,8 @@
 Summary:	A GObject to SQLite object mapper
 Name:		gom
 Version:	0.4
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
@@ -29,7 +30,7 @@ queries upon that data.
 %package        devel
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -40,7 +41,7 @@ Header files and libraries for building a extension library for the %{name}.
 %package        docs
 Summary:        Documentation for %{name}
 Summary(ja):    %{name} 用のドキュメント
-Group:          Documentation
+Group:          documentation
 BuildArch:      noarch
 
 %description    docs
@@ -53,7 +54,11 @@ This package contains documentation for %{name}.
 
 %build
 %meson \
+%ifnarch %{ix86}
   -Denable-gtk-doc=true
+%else
+  -Denable-gtk-doc=false
+%endif
 %meson_build
 
 
@@ -87,12 +92,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 %{_datadir}/gir-1.0/Gom-1.0.gir
 
+%ifnarch %{ix86}
 %files docs
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/%{name}
-
+%endif
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4-2
+- rebuilt with python-3.8.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4-1
 - new upstream release.
 

+ 18 - 8
g/gpgme/gpgme-vl.spec

@@ -3,12 +3,14 @@
 
 %define _unpackaged_files_terminate_build 1
 
-Name:		gpgme
 Summary:	GPGME - GnuPG Made Easy
 Summary(ja):	GPGME - GnuPG Made Easy
-Version:	1.13.1
+Name:		gpgme
+Version:	1.14.0
 Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 License:	LGPL
 URL:		https://gnupg.org/software/gpgme/index.html
@@ -33,9 +35,6 @@ Requires:	libgpg-error >= %{_libgpg_error_ver}
 Obsoletes:	gpgme10
 Provides:	gpgme10
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
 %description
 GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier
 for applications. It provides a High-Level Crypto API for encryption,
@@ -50,10 +49,11 @@ GnuPG Made Easy (GPGME) は、アプリケーションがより簡単に GnuPG 
 現在のところ、バックエンドとして GnuPG を使用しますが、API はこのエンジンに限
 定されません。実際、他のバックエンドを追加することが計画されています。
 
+
 %package devel
 Summary:	GnuPG Made Easy (GPGME) Header files and libraries for development
 Summary(ja):	GnuPG Made Easy (GPGME) 開発用ヘッダーファイル・ライブラリ
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}
 Requires:	libgpg-error-devel >= 0.5
 Requires:	libassuan-devel >= 2.0.2
@@ -77,16 +77,20 @@ GnuPG Made Easy (GPGME) は、アプリケーションがより簡単に GnuPG 
 GPGME ライブラリを使用するアプリケーションを開発するのであれば、このパッケー
 ジをインストールしてください。
 
+
 %package -n python-gpg
 Summary:        %{name} bindings for Python 2
+Group:		programming
 %{?python_provide:%python_provide python2-gpg}
 Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n python-gpg
 %{summary}.
 
+
 %package -n python3-gpg
 Summary:        %{name} bindings for Python 3
+Group:		programming
 %{?python_provide:%python_provide python3-gpg}
 Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -97,6 +101,7 @@ Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %prep
 %setup -q
 
+
 %build
 %configure --disable-gpgsm-test
 %__make
@@ -117,11 +122,12 @@ chrpath -d %{buildroot}%{_libdir}/lib%{name}*.so*
 rm -vf %{buildroot}%{python2_sitelib}/gpg/install_files.txt
 rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
 
+
 %clean
 %__rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %triggerun -- %{name} < 0.3.16-0vl2
@@ -138,6 +144,7 @@ fi
 %triggerpostun devel -- %{name} < 0.3.16-0vl2, gpgme10-devel
 /sbin/install-info %{_infodir}/gpgme.info.gz %{_infodir}/dir
 
+
 %files
 %defattr(-,root,root)
 %license COPYING*
@@ -167,6 +174,9 @@ fi
 %{python3_sitearch}/gpg/
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.0-1
+- new upstream release.
+
 * Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.13.1-1
 - new upstream release.
 

+ 162 - 86
h/hplip/hplip-vl.spec

@@ -2,8 +2,11 @@
 Summary:	HP printer drivers & utilities for Linux
 Summary(ja): 	HP プリンタの Linux 向けドライバとユーティリティ
 Name:		hplip
-Version:	3.18.12
+Version:	3.20.6
 Release: 	1%{?_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	kazutaka
 
 License:	GPLv2+, MIT and BSD
 Group:		Applications/Publishing
@@ -13,30 +16,32 @@ Source0:	http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar
 #Source1:	hpcups-update-ppds.sh
 Source2:	copy-deviceids.py
 Source3:	%{name}.appdata.xml
+Source4:	hp-laserjet_cp_1025nw.ppd.gz
+Source5:	hp-laserjet_professional_p_1102w.ppd.gz
 Source1000:	hplip.desktop.vine
 
-Patch1:		hplip-pstotiff-is-rubbish.patch
-Patch2:		hplip-strstr-const.patch
-Patch3:		hplip-ui-optional.patch
-Patch4:		hplip-no-asm.patch
-Patch5:		hplip-deviceIDs-drv.patch
-Patch6:		hplip-udev-rules.patch
-Patch7:		hplip-retry-open.patch
-Patch8:		hplip-snmp-quirks.patch
-Patch9:		hplip-hpijs-marker-supply.patch
-Patch10:	hplip-clear-old-state-reasons.patch
-Patch11:	hplip-hpcups-sigpipe.patch
-Patch12:	hplip-logdir.patch
-Patch13:	hplip-bad-low-ink-warning.patch
-Patch14:	hplip-deviceIDs-ppd.patch
-Patch15:	hplip-ppd-ImageableArea.patch
-Patch16:	hplip-scan-tmp.patch
-Patch17:	hplip-log-stderr.patch
-Patch18:	hplip-avahi-parsing.patch
-Patch20:	hplip-dj990c-margin.patch
-Patch21:	hplip-strncpy.patch
-Patch22:	hplip-no-write-bytecode.patch
-Patch23:	hplip-silence-ioerror.patch
+Patch1: hplip-pstotiff-is-rubbish.patch
+Patch2: hplip-strstr-const.patch
+Patch3: hplip-ui-optional.patch
+Patch4: hplip-no-asm.patch
+Patch5: hplip-deviceIDs-drv.patch
+Patch6: hplip-udev-rules.patch
+Patch7: hplip-retry-open.patch
+Patch8: hplip-snmp-quirks.patch
+Patch9: hplip-hpijs-marker-supply.patch
+Patch10: hplip-clear-old-state-reasons.patch
+Patch11: hplip-hpcups-sigpipe.patch
+Patch12: hplip-logdir.patch
+Patch13: hplip-bad-low-ink-warning.patch
+Patch14: hplip-deviceIDs-ppd.patch
+Patch15: hplip-ppd-ImageableArea.patch
+Patch16: hplip-scan-tmp.patch
+Patch17: hplip-log-stderr.patch
+Patch18: hplip-avahi-parsing.patch
+Patch20: hplip-dj990c-margin.patch
+Patch21: hplip-strncpy.patch
+Patch22: hplip-no-write-bytecode.patch
+Patch23: hplip-silence-ioerror.patch
 Patch24: hplip-3165-sourceoption.patch
 Patch25: hplip-noernie.patch
 Patch26: hplip-appdata.patch
@@ -48,39 +53,30 @@ Patch30: hplip-typo.patch
 # code gets fixed.
 Patch31: hplip-use-binary-str.patch
 # m278-m281 doesn't work correctly again
-Patch32: hplip-colorlaserjet-mfp-m278-m281.patch
-Patch33: hplip-error-print.patch
-Patch34: hplip-hpfax-importerror-print.patch
-Patch35: hplip-wifisetup.patch
-# bz1645815, hplaunchpad1802941 - python3.7 treats StopIteration in generators
-# differently than before, now it gets propagated as other exceptions and
-# it cannot silently end the loop (as it was sometimes used) - use 'return'
-# instead of raising StopIteration exception
-Patch36: hplip-stopiteration.patch
+Patch32: hplip-error-print.patch
+Patch33: hplip-hpfax-importerror-print.patch
+Patch34: hplip-wifisetup.patch
 # pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
 # to choose (Bz#1641100, launchpad#1799212)
-Patch37: hplip-keyserver.patch
+Patch35: hplip-keyserver.patch
 # QMessagebox call was copy-pasted from Qt4 version, but Qt5 has different arguments,
 # This patch solves most of them
-Patch38: 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch
+Patch36: 0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch
 # HP upstream introduced new binary blob, which is not open-source, so it violates
 # FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
 # Patch is taken from Debian.
-Patch39: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
+Patch37: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
 # In hplip-3.18.10 some parts of UI code was commented out, which leaved hp-toolbox
 # unusable (crashed on the start). The patch removes usages of variables, which were
 # commented out.
 # The patch is taken from Debian.
-Patch40: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch
-# New tool - hp-uiscan - misses support of -h argument and crashes with traceback
-# Reported as https://bugs.launchpad.net/hplip/+bug/1810943
-Patch41: hplip-uiscan-help.patch
+Patch38: 0027-Fixed-incomplete-removal-of-hp-toolbox-features-whic.patch
 # hp-setup crashed when user wanted to define a path to PPD file. It was due
 # byte + string variables incompatibility and it is fixed by decoding the 
 # bytes-like variable
 # part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
 # reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
-Patch42: hplip-add-ppd-crash.patch
+Patch39: hplip-add-ppd-crash.patch
 # external scripts, which are downloaded and run by hp-plugin, try to create links
 # in non-existing dirs. These scripts ignore errors, so plugin is installed fine
 # but then internal hp-plugin can check for plugin state, where links are checked too.
@@ -89,28 +85,85 @@ Patch42: hplip-add-ppd-crash.patch
 # because their external scripts try to create links in non-existing dirs.
 # Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
 # Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
-Patch43: hplip-missing-links.patch
+Patch40: hplip-missing-links.patch
 # change in 3.18.9 in scanext.c caused broken scanning for HP LaserJet 3052. Since I cannot figure
 # it out what author wanted by the change (it sets option number 9 to true, but different handles
 # have different options, so I'm not sure what author wanted to set).
 # Remove the change for now, it works for user and me.
-Patch44: hplip-hplj-3052.patch
+Patch41: hplip-hplj-3052.patch
 # hpmud parses mdns txt record badly
 # upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
 #                   https://bugs.launchpad.net/hplip/+bug/1817214
 #                   https://bugs.launchpad.net/hplip/+bug/1821932
 # with no response from upstream
 # Patch taken from Debian https://lists.debian.org/debian-printing/2018/11/msg00049.html
-Patch45: hplip-hpmud-string-parse.patch
+Patch42: hplip-hpmud-string-parse.patch
 # Part of https://bugzilla.redhat.com/show_bug.cgi?id=1694663
 # It was found out that specific device needs plugin for scanning
 # Reported upstream as https://bugs.launchpad.net/hplip/+bug/1822762
-Patch46: hplip-m278-m281-needs-plugin.patch
+Patch43: hplip-m278-m281-needs-plugin.patch
 # hpcups crashes when a printer needs a plugin and does not have one installed
 # it crashes in destructor, because pointer is not initialized
 # bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
 # reported upstream 
-Patch47: hplip-hpcups-crash.patch
+Patch44: hplip-hpcups-crash.patch
+# Fixing the issues found by coverity scan
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1808145
+Patch45: hplip-covscan.patch
+# Segfault during logging to syslog because argument are switched
+# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1727162
+# upstream https://bugs.launchpad.net/hplip/+bug/1837846
+Patch46: hplip-logging-segfault.patch
+# Traceback in hp-systray when there are no resource
+# wanted to report upstream, but launchpad ends with timeout error
+# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1738321
+Patch47: hplip-systray-blockerror.patch
+# several printers were removed in 3.19.1, but actually someone still uses them
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1843592
+# bugzillas 1742949, 1740132, 1739855
+Patch48: hplip-missing-drivers.patch
+# laserjet 2200 and other devices have different device id than HP expects...
+# https://bugzilla.redhat.com/show_bug.cgi?id=1772698
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1853002
+Patch49: hplip-model-mismatch.patch
+# sixext has problems with python3 strings (bz#1573430)
+# reported https://bugs.launchpad.net/bugs/1480152
+Patch50: hplip-unicodeerror.patch
+# error with new gcc, already reported in upstream as
+# https://bugs.launchpad.net/hplip/+bug/1836735
+Patch51: hplip-fix-Wreturn-type-warning.patch
+# upstream check for python clears OS build system
+# CFLAGS
+# https://bugs.launchpad.net/hplip/+bug/1879445
+Patch52: hplip-configure-python.patch
+# taken from hplip upstream report - toolbox uses deprecated method
+# setMargin(), which generates an exception, resulting in a infinite loop
+# of request on cupsd
+# https://bugs.launchpad.net/hplip/+bug/1880275
+Patch53: hplip-dialog-infinite-loop.patch
+# searching algorithm did not expect '-' in model name and thought it is a new PDL
+# it resulted in incorrect PPD match, so e.g. hpijs driver was used instead of hpcups
+# bug: https://bugzilla.redhat.com/show_bug.cgi?id=1590014
+# reported upstream: https://bugs.launchpad.net/hplip/+bug/1881587
+Patch54: hplip-find-driver.patch
+# hp-clean didn't work for Photosmart C1410 because it was comparing
+# string length with buffer size for string object, which is different,
+# causing cleaning to fail - the fix is to make the object bytes-like,
+# then buffer size is the same as the length.
+# Thanks to Stefan Assmann we were able to fix level 1 cleaning
+# for the device, but there can be similar issues with other devices
+# bug https://bugzilla.redhat.com/show_bug.cgi?id=1833308
+# reported upstream https://bugs.launchpad.net/hplip/+bug/1882193
+Patch55: hplip-clean-ldl.patch
+# 3.20.6 turned off requirement for most devices which needed it
+# - it will cause malfunction of printing and scanning for them
+# https://bugs.launchpad.net/hplip/+bug/1883898
+Patch56: hplip-revert-plugins.patch
+# python3.9 removes threading.Thread.isAlive() and it is substituted
+# by threading.Thread.is_alive()
+# https://bugzilla.redhat.com/show_bug.cgi?id=1861055
+# reported upstream https://bugs.launchpad.net/fedora/+bug/1889280
+Patch57: hplip-thread-isalive-removed.patch
 
 # Vine Patches
 Patch70:	hplip-3.11.5-gksu.patch
@@ -136,6 +189,8 @@ BuildRequires:	python3-rpm-macros
 BuildRequires:	python3-cups, cups
 BuildRequires:	sane-devel
 BuildRequires:	python3-qt5
+BuildRequires:	libappstream-glib
+BuildRequires:	gsettings-desktop-schemas
 # to force to use Qt5
 BuildConflicts:	PyQt
 BuildConflicts:	PyQt4
@@ -143,11 +198,6 @@ BuildConflicts:	PyQt4
 Provides:	hpijs = %{version}-%{release}
 Obsoletes:	hpijs < %{version}-%{release}
 
-
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	kazutaka
-
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
 drivers for HP printers and multi-function peripherals.
@@ -331,53 +381,72 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 %patch30 -p1 -b .typo
 
 %patch31 -p1 -b .use-binary-str
-%patch32 -p1 -b .colorlaserjet-mfp-m278-m281
 
 # TypeError: 'Error' object does not support indexing (bug #1564770)
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 # in python2 it was possible to acces Exception message by index [0].
 # in python3 this is no longer possible and it causes TypeError.
-%patch33 -p1 -b .error-print-fix
+%patch32 -p1 -b .error-print-fix
 
 # TypeError: not all arguments converted during string formatting (bug #1566938)
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
 # bug caused by more arguments than argument specifiers in formatted string
-%patch34 -p1 -b .hpfax-import-error-print
+%patch33 -p1 -b .hpfax-import-error-print
 
 # 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
 # upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
 # bug caused by typo in wifisetupdialog wifiObj property call
-%patch35 -p1 -b .wifisetup-bad-call-fix
-
-# 1645815 - hp-check --runtime crashes involving FileNotFoundError
-%patch36 -p1 -b .stopiteration
+%patch34 -p1 -b .wifisetup-bad-call-fix
 
 # have pool of keyservers to choose
-%patch37 -p1 -b .keyserver
+%patch35 -p1 -b .keyserver
 
 # TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
 # bug caused by typo in QMessageBox constructor call
 # this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
-%patch38 -p1 -b .qmsgbox-typos-fix
-%patch39 -p1 -b .libimageprocessor-removal
+%patch36 -p1 -b .qmsgbox-typos-fix
+
+# removal of non open source code, taken from ubuntu
+%patch37 -p1 -b .libimageprocessor-removal
 
-rm prnt/hpcups/libImageProcessor-x86*
+%__rm prnt/hpcups/libImageProcessor-x86*
 
-%patch40 -p1 -b .toolbox-crash
-%patch41 -p1 -b .uiscan-help
+%patch38 -p1 -b .toolbox-crash
 # part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
-%patch42 -p1 -b .add-ppd-crash
+%patch39 -p1 -b .add-ppd-crash
 # 1671513 - after 'successful' plugin installation it is not installed
-%patch43 -p1 -b .missing-links
+%patch40 -p1 -b .missing-links
 # 1684434 - Scanning broken for HP LaserJet 3052
-%patch44 -p1 -b .hp-laserjet-3052-broken-scanning
+%patch41 -p1 -b .hp-laserjet-3052-broken-scanning
 # 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 1)
-%patch45 -p1 -b .hpmud-string-parse
+%patch42 -p1 -b .hpmud-string-parse
 # 1694663 - Cannot scan with M281fdw LaserJet - failed: Error during device I/O (part 2)
-%patch46 -p1 -b .m278-m281-needs-plugin
+%patch43 -p1 -b .m278-m281-needs-plugin
 # 1695716 - hpcups crashes in Compressor destructor
-%patch47 -p1 -b .hpcups-crash
+%patch44 -p1 -b .hpcups-crash
+# fixing issues found by coverity scan
+%patch45 -p1 -b .covscan
+# segfault during logging (1727162)
+%patch46 -p1 -b .logging-segfault
+# 1738321 - [abrt] hp-systray:BlockingIOError: [Errno 11] Resource temporarily unavailable
+%patch47 -p1 -b .systray-blockerror
+# 1742949, 1740132, 1739855 - missing drivers
+%patch48 -p1 -b .missing-drivers
+# 1772698 - Can't setup printer (HP LJ 2200): no attributes found in model.dat
+%patch49 -p1 -b .model-mismatch
+# 1573430 - sixext.py:to_string_utf8:UnicodeDecodeError: 'utf-8' codec can't decode bytes
+%patch50 -p1 -b .unicodeerror
+%patch51 -p1 -b .Wreturn-fix
+%patch52 -p1 -b .configure-python
+%patch53 -p1 -b .dialog-infinite-loop
+# 1590014 - hplip PPD search doesn't expect '-' in device name
+%patch54 -p1 -b .find-driver
+# 1833308 - hp-clean cannot clean HP PSC1410 - Device I/O error
+%patch55 -p1 -b .clean-ldl
+%patch56 -p1 -b .revert-plugins
+# 1861055 - hplip: remove threading.Thread.isAlive method calls - use threading.Thread.is_alive()
+%patch57 -p1 -b .thread-isalive-removed
 
 # vine
 
@@ -397,9 +466,14 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
 
 rm locatedriver
 
+cp -p %{SOURCE4} %{SOURCE5} ppd/hpcups
+
+
 %build
+# Work-around Makefile.am imperfections.
+sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in
 touch NEWS README AUTHORS ChangeLog
-autoreconf -f -i
+autoreconf -fiv
 %configure \
         --enable-scan-build --enable-gui-build --enable-fax-build \
         --disable-foomatic-rip-hplip-install --enable-pp-build \
@@ -414,16 +488,12 @@ autoreconf -f -i
 	--with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP \
 	PYTHON=%{__python3}
 
-
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-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 rulesdir=/lib/udev/rules.d
+make install DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} rulesdir=/lib/udev/rules.d
 
 # Create /run/hplip & /var/lib/hp
 mkdir -p $RPM_BUILD_ROOT/run/hplip
@@ -468,8 +538,8 @@ rm -f   %{buildroot}%{_bindir}/foomatic-rip \
         %{buildroot}%{_datadir}/applications/hplip.desktop \
         %{buildroot}%{_datadir}/ppd/HP/*.ppd
 
-mkdir -p %{buildroot}%{_datadir}/appdata
-cp %{SOURCE3} %{buildroot}%{_datadir}/appdata/
+mkdir -p %{buildroot}%{_datadir}/metainfo
+cp %{SOURCE3} %{buildroot}%{_datadir}/metainfo/
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps
 install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/16x16/hp_logo.png \
@@ -479,18 +549,24 @@ install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/32x32/hp_logo.png \
 install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/64x64/hp_logo.png \
    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/hp_logo.png
 
-cp -p %{SOURCE1000} hplip.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e '/^Categories=/d' hplip.desktop
 # Encoding key is deprecated
 sed -i -e '/^Encoding=/d' hplip.desktop
-desktop-file-install --vendor "HP"                                \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
-        --add-category System                                   \
-        --add-category Settings                                 \
-        --add-category HardwareSettings                         \
+desktop-file-validate hplip.desktop
+
+desktop-file-install                               \
+        --dir %{buildroot}/%{_datadir}/applications              \
+        --add-category System \
+        --add-category Settings \
+        --add-category HardwareSettings                        \
         hplip.desktop
 
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+
+# install hp-uiscan desktop file
+sed -i 's/\/usr\/share\/icons\/Humanity\/devices\/48\/printer\.svg/hp_logo/' hp-uiscan.desktop
+
 # Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
 #install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/hpcups-update-ppds
 
@@ -530,9 +606,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
@@ -652,7 +728,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp-toolbox
 %{_bindir}/hp-uiscan
 %{_datadir}/applications/*.desktop
-%{_datadir}/appdata/hplip.appdata.xml
+%{_datadir}/metainfo/hplip.appdata.xml
 # Files
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/hplip/check.py*

+ 86 - 42
l/lirc/lirc-vl.spec

@@ -1,44 +1,56 @@
-%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%bcond_with systemd
 
 %global _udevrulesdir /lib/udev/rules.d
 
+# Don't provide or require anything from _docdir, per policy.
+%global __provides_exclude_from ^%{_docdir}/.*$
+%global __requires_exclude_from ^%{_docdir}/.*$
+
 Summary:	The Linux Infrared Remote Control package.
 Summary(ja):	赤外線リモートコントロールパッケージ
 Name:		lirc
-Version:	0.9.4a
-Release:	1%{?_dist_release}
-License:	GPL
-Group:		System Environment/Daemons
-URL:		http://www.lirc.org/
-Source0:	http://prdownloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Version:	0.10.1
+Release:	1%{?_dist_release}%{?with_systemd:.systemd}
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	owa, kazutaka
+
+# lib/ciniparser* and lib/dictionary* are BSD, others GPLv2
+License:	GPLv2 and BSD
+URL:		https://www.lirc.org/
+Source0:	https://prdownloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:	lirc.init
 Source2:	lircd.logrotate
 Source3:	lirc.sysconfig
 Source4:	99-remote-control-lirc.rules
 
-Patch1:		0001-Changing-effective-user-default.patch
+Patch2:         0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
+Patch6:         0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch
 
 # Vine patch
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	perl
-BuildRequires:	libusb1-devel, python-devel
+BuildRequires:	libusb1-devel
 BuildRequires:	automake libtool
 BuildRequires:	alsa-lib-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libxslt
-BuildRequires:  python3
+BuildRequires:	python3-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:	python3-setuptools
 ## Currently not supportd (yet) for Vine Linux
 #BuildRequires:	libftdi-devel, libirman-devel
+%if %{with systemd}
+BuildRequires:	systemd-devel
+%{?systemd_requires}
+%else
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager:	owa, kazutaka
+%endif
 
 %description
 LIRC stands for 'Linux Infra-red Remote Control'.
@@ -56,7 +68,7 @@ LIRC は 'Linux Infra-red Remote Control' の略です。
 %package	devel
 Summary:	Development files for LIRC
 Summary(ja):	LIRCを用いた開発用のファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	lirc = %{version}-%{release}
 
 %description    devel
@@ -70,7 +82,7 @@ developing applications that use LIRC.
 
 %package -n dkms-%{name}
 Summary:	Kernel modules for LIRC
-Group:		System Environment/Kernel
+Group:		system
 Requires(post):	dkms
 Requires(preun):dkms
 
@@ -128,47 +140,55 @@ Note that lirc_gpio and lirc_parallel are in packages of their own.
 
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{version}%{?tag:-}%{?tag}
+
+sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
+sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
+sed -i '/User=/s/; *//' systemd/lircd.service
+sed -i '/Group=/s/; *//' systemd/lircd.service
+sed -i 's/; *user=/User=/' systemd/irexec.service
+sed -i 's/; *group=/Group=/' systemd/irexec.service
 
-%patch1 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
 %build
 autoreconf -if
 %configure \
-         --disable-static \
-         --disable-manage-devices \
-         --enable-sandboxed \
-         --with-x \
-         --with-transmitter \
+	--disable-static \
+	--disable-manage-devices \
+	--enable-sandboxed \
+	--with-x \
+	--with-transmitter \
 	--with-driver=userspace \
 	--with-kerneldir=$(pwd)
 
-%{__make}
+make LANG=C.utf8 V=0 %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT __docs
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-
-%{__install} -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/lirc
-#%{__install} -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/lircd
-%{__install} -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+make -s V=0 LIBTOOLFLAGS="--silent %{?Wnone}" DESTDIR=$RPM_BUILD_ROOT install
 
-cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
-chmod 755 irman2lirc
-cd $OLDPWD
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/lirc/contrib/irman2lirc
+find $RPM_BUILD_ROOT%{_libdir}/ -name \*.la -delete
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 contrib/60-lirc.rules \
     $RPM_BUILD_ROOT%{_udevrulesdir}/60-lirc.rules
-install -Dpm 644 %{SOURCE4} \
+install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
-cp -a %{SOURCE1} README.fedora
 
+%if %{with systemd}
+mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
+echo "d %{_rundir}/lirc  0755  lirc  lirc  -" \
+    > $RPM_BUILD_ROOT%{_tmpfilesdir}/lirc.conf
+%else
+%{__install} -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initdir}/lirc
+%{__install} -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+%endif
+
+#%{__install} -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/lircd
 
 ## For DKMS sub packagtes
 #
@@ -253,7 +273,12 @@ usermod -a -G input lirc &> /dev/null || :
 exit 0
 
 %post
+%if %{with systemd}
+%systemd_post lircd.service lircmd.service
+systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
+%else
 /sbin/chkconfig --add lirc
+%endif
 # If we're upgrading, move config files into their new location, if need be
 if [ $1 -ge 2 ] ; then
   if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
@@ -266,16 +291,24 @@ fi
 /sbin/ldconfig
 
 %preun
-if [ $1 -eq 0 ] ; then
+%if %{with systemd}
+%systemd_preun lircd.service lircmd.service
+%else
+if [ $1 -eq 0 -o -x /bin/systemctl ] ; then
   /sbin/service lirc stop || :
   /sbin/chkconfig --del lirc || :
 fi
+%endif
 /sbin/ldconfig
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart lircd.service lircmd.service
+%else
 if [ "$1" -ge "1" ]; then
   /sbin/service lirc condrestart || :
 fi
+%endif
 
 %post -n dkms-%{name}
 dkms add     -m %{name} -v %{version}-%{release} --rpm_safe_upgrade &&
@@ -311,14 +344,12 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 %license COPYING
 %doc ANNOUNCE AUTHORS ChangeLog NEWS README TODO
 %doc __docs/*
-%{_initdir}/lirc
 #/etc/logrotate.d/lircd
 %dir %{_sysconfdir}/lirc
 %dir %{_sysconfdir}/lirc/lircd.conf.d
 %ghost %config(noreplace) %{_sysconfdir}/lirc/*.conf
 %ghost %config(noreplace) %{_sysconfdir}/lirc/irexec.lircrc
 %ghost %config(noreplace) %{_sysconfdir}/lirc/lircd.conf.d/*
-%config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/*.so.*
@@ -328,7 +359,16 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 %{_mandir}/man?/*
 %{_localstatedir}/lib/lirc
 %{_udevrulesdir}/*
-%{python3_sitelib}/lirc
+%{_libdir}/python%{python3_version}/site-packages/lirc
+%{_libdir}/python%{python3_version}/site-packages/lirc-setup
+%if %{with systemd}
+%{_tmpfilesdir}/lirc.conf
+%{_unitdir}/lirc*
+%{_unitdir}/irexec.service
+%else
+%{_initdir}/lirc
+%config(noreplace) %{_sysconfdir}/sysconfig/lirc
+%endif
 
 %files devel
 %{_includedir}/lirc/
@@ -350,6 +390,10 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.10.1-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Sat Jul 16 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.4-1
 - updated to 0.9.4.
 - dropped Patch0.

+ 14 - 6
lib/liba/libappstream-glib/libappstream-glib-vl.spec

@@ -11,8 +11,8 @@ Summary:	Library for AppStream metadata
 Summary(ja):	AppStream メタデータ用ライブラリ
 Name:		libappstream-glib
 Version:	0.7.17
-Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+Release:	2%{?_dist_release}
+Group:		admin-tools,system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
@@ -51,6 +51,8 @@ BuildRequires: sqlite3-devel
 BuildRequires: libxslt
 BuildRequires: docbook-style-xsl
 
+Requires:      gsettings-desktop-schemas
+
 Obsoletes: appdata-tools < 0.1.9
 Provides: appdata-tools
 
@@ -65,7 +67,7 @@ from the standardized XML representation.
 %package		devel
 Summary:		Development tools for %{name}
 Summary(ja):	%{name} の開発環境
-Group:			Development/Libraries
+Group:			programming
 Requires:		%{name} = %{version}-%{release}
 Requires:		pkgconfig
 
@@ -76,7 +78,7 @@ Header files and libraries for building a extension library for the %{name}.
 %package		docs
 Summary:		Documentation for %{name}
 Summary(ja):	%{name} 用のドキュメント
-Group:			Documentation
+Group:			documentation
 Requires:		%{name} = %{version}-%{release}
 BuildArch:		noarch
 
@@ -87,7 +89,7 @@ This package contains documentation for %{name}.
 %package -n libappstream-builder
 Summary:		Library and command line tools for building AppStream metadata
 Summary(ja):	AppStream メタデータを生成するためのライブラリ及びコマンドラインツール
-Group:			System Environment/Libraries
+Group:			admin-tools,system
 Requires:		%{name} = %{version}-%{release}
 
 %description -n libappstream-builder
@@ -101,7 +103,9 @@ Requires:		%{name} = %{version}-%{release}
 export LANG=ja_JP.UTF-8
 
 %meson \
+%ifarch x86_64
     -Dgtk-doc=true \
+%endif
     -Dstemmer=false \
     -Ddep11=false
 %meson_build
@@ -141,16 +145,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/appstream-glib.pc
 %dir %{_includedir}/libappstream-glib
 %{_includedir}/libappstream-glib/*.h
-%{_datadir}/gtk-doc/html/appstream-glib
 %{_datadir}/gir-1.0/AppStreamGlib-1.0.gir
 %{_datadir}/aclocal/*.m4
 %{_datadir}/installed-tests/appstream-glib/*.test
 %{_datadir}/gettext/its/appdata.its
 %{_datadir}/gettext/its/appdata.loc
 
+%ifarch x86_64
 %files docs
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/appstream-glib
+%endif
 
 %files -n libappstream-builder
 %defattr(-,root,root,-)
@@ -168,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.17-2
+- added R:gsettins-desktop-schemas.
+
 * Sat Aug 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.17-1
 - new usptream release.
 

+ 9 - 1
lib/libb/libblockdev/libblockdev-vl.spec

@@ -113,7 +113,7 @@
 Summary:      A library for low-level manipulation with block devices
 Name:         libblockdev
 Version:      2.24
-Release:      1%{?_dist_release}%{?with_systemd:.systemd}
+Release:      2%{?_dist_release}%{?with_systemd:.systemd}
 Group:        system
 Vendor:       Project Vine
 Distribution: Vine Linux
@@ -1024,7 +1024,15 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 
 %files plugins-all
 
+
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.24-2
+- rebuilt with python3.
+
+* Tue Aug 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.24-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Mon Mar 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.23-1
 - new upstream release.
 - dropped Patch0: fixed in upstream.

+ 15 - 5
lib/libb/libbytesize/libbytesize-vl.spec

@@ -12,16 +12,16 @@
 
 %define configure_opts %{?python3_opts} %{?python2_opts}
 
+Summary:      A library for working with sizes in bytes
 Name:         libbytesize
-Version:      2.2
+Version:      2.4
 Release:      1%{?_dist_release}
-Summary:      A library for working with sizes in bytes
-License:      LGPLv2+
-URL:          https://github.com/storaged-project/libbytesize
-
+Group:        system
 Vendor:       Project Vine
 Distribution: Vine Linux
 
+License:      LGPLv2+
+URL:          https://github.com/storaged-project/libbytesize
 Source0:      https://github.com/storaged-project/libbytesize/releases/download/%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc
@@ -47,17 +47,21 @@ bytes. Be it parsing the input from users or producing a nice human readable
 representation of a size in bytes this library takes localization into
 account. It also provides support for sizes bigger than MAXUINT64.
 
+
 %package devel
 Summary:  Development files for libbytesize
+Group:    programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 This package contains header files and pkg-config files needed for development
 with the libbytesize library.
 
+
 %if %{with_python2}
 %package -n python-%{realname}
 Summary: Python 2 bindings for libbytesize
+Group:   programming
 %{?python_provide:%python_provide python2-%{realname}}
 %{?python_provide:%python_provide python2-libbytesize}
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -68,9 +72,11 @@ This package contains Python 2 bindings for libbytesize making the use of
 the library from Python 2 easier and more convenient.
 %endif
 
+
 %if %{with_python3}
 %package -n python3-%{realname}
 Summary: Python 3 bindings for libbytesize
+Group:   programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python3-six
 
@@ -79,6 +85,7 @@ This package contains Python 3 bindings for libbytesize making the use of
 the library from Python 3 easier and more convenient.
 %endif
 
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -130,6 +137,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
 %endif
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4-1
+- new upstream release.
+
 * Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.2-1
 - new upstream release.
 

+ 6 - 3
lib/libp/libpeas/libpeas-vl.spec

@@ -1,8 +1,8 @@
+Summary:	Plug-ins implementation convenience library
 Name:		libpeas
 Version:	1.26.0
-Release:	1%{?_dist_release}
-Summary:	Plug-ins implementation convenience library
-Group:		System Environment/Libraries
+Release:	2%{?_dist_release}
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
@@ -121,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.0-2
+- rebuilt with python-3.8.
+
 * Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.0-1
 - new upstream release.
 

+ 28 - 26
lib/libt/libtdb/libtdb-vl.spec

@@ -2,13 +2,15 @@
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Name: libtdb
 Summary: The tdb library
 Summary(ja): TDB ライブラリ
+Name: libtdb
 Version: 1.4.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Group: System Environment/Libraries
 License: LGPLv3+
 URL: https://tdb.samba.org/
 Source: https://samba.org/ftp/tdb/tdb-%{version}.tar.gz
@@ -23,45 +25,45 @@ BuildRequires: python-devel python-rpm-macros
 BuildRequires: python3-devel python3-rpm-macros
 BuildRequires: libtirpc-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
 %description
 A library that implements a trivial database.
 
+
 %package devel
 Summary: Header files need to link the Tdb library
-Group: Development/Libraries
+Group: programming
 Requires: libtdb = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
 Header files needed to develop programs that link against the Tdb library.
 
+
 %package -n tdb-tools
 Summary: Tools to manipulate tdb files
 Summary(ja): TDB ファイルを処理するためのツール集
-Group: Applications/System
+Group: admin-tools
 Requires: libtdb = %{version}-%{release}
 
 %description -n tdb-tools
 Tools to manage Tdb files
 
+
 %if %{with python2}
 %package -n python-tdb
 Summary: Python bindings for the Tdb library
 Summary(ja): TDB ライブラリの python バインディング
-Group: System Environment/Libraries
+Group: programming
 Requires: libtdb = %{version}-%{release}
 
 %description -n python-tdb
 Python bindings for libtdb
-
 %endif
 
+
 %package -n python3-tdb
 Summary: Python3 bindings for the Tdb library
+Group: programming
 Requires: libtdb = %{version}-%{release}
 %{?python_provide:%python_provide python3-tdb}
 %if %{without python2}
@@ -71,36 +73,37 @@ Obsoletes: python-tdb < %{version}
 %description -n python3-tdb
 Python3 bindings for libtdb
 
-%if %{build_compat32}
 
+%if %{build_compat32}
 %package -n compat32-libtdb
 Summary: The TDB library
 Summary(ja): TDB ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: libtdb = %{version}-%{release}
 
 %description -n compat32-libtdb
 A library that implements a trivial database.
-
 %endif
 
+
 %prep
 %setup -q -n tdb-%{version}
 
+
 %build
 #./autogen.sh
 %if %{without python2}
 export PYTHON=%{__python3}
 %endif
 %configure --disable-rpath \
-	--bundled-libraries=NONE \
-	--builtin-libraries=replace \
 %if %{with python2}
-	--extra-python=%{__python3}
+	--extra-python=%{__python3} \
 %endif
-
+	--bundled-libraries=NONE \
+	--builtin-libraries=replace
 make %{?_smp_mflags} V=1
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -112,9 +115,11 @@ find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \;
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libtdb.so.*
@@ -146,35 +151,32 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitearch}/*
 
 %if %{build_compat32}
-
 %files -n compat32-libtdb
 %attr(755,root,root) %{_libdir}/libtdb.so.*
-
 %endif
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %if %{with python2}
 %post -n python-tdb -p /sbin/ldconfig
-
 %postun -n python-tdb -p /sbin/ldconfig
-
 %endif
 
 %post -n python3-tdb -p /sbin/ldconfig
-
 %postun -n python3-tdb -p /sbin/ldconfig
 
 %if %build_compat32
-
 %post -n compat32-libtdb -p /sbin/ldconfig
 %postun -n compat32-libtdb -p /sbin/ldconfig
-
 %endif
 
+
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.3-2
+- rebuilt with python-3.8.
+
 * Tue Mar 31 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.3-1
 - new upstream release.
 

+ 28 - 14
lib/libx/libxml2/libxml2-vl.spec

@@ -2,9 +2,12 @@ Summary: Library providing XML and HTML support
 Summary(ja): XML や HTML サポートを提供するライブラリ
 Name: libxml2
 Version: 2.9.10
-Release: 2%{_dist_release}
+Release: 3%{_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT
-Group: System Environment/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
 
 Patch0: libxml2-multilib.patch
@@ -16,7 +19,8 @@ Patch1000:      CVE-2019-20388.patch
 Patch1001:      CVE-2020-7595.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: python python-devel python-rpm-macros
+BuildRequires: python-rpm-macros
+BuildRequires: python python-devel python2-rpm-macros
 BuildRequires: python3 python3-devel python3-rpm-macros
 BuildRequires: libxcrypt-devel
 BuildRequires: zlib-devel
@@ -24,9 +28,6 @@ BuildRequires: pkgconfig
 
 URL: http://xmlsoft.org/
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %description
@@ -48,10 +49,11 @@ URI library.
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
+
 %package -n compat32-%{name}
 Summary: Library providing XML and HTML support
 Summary(ja): XML や HTML サポートを提供するライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -73,10 +75,11 @@ URI library.
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
+
 %package devel
 Summary: Libraries, includes, etc. to develop XML and HTML applications
 Summary(ja): XML や HTML アプリケーションを開発するためのライブラリやヘッダ類
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel
 Requires: pkgconfig
@@ -103,10 +106,11 @@ DTDに対応しており、パース時や一度ドキュメントが修正さ
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
+
 %package -n compat32-%{name}-devel
 Summary: Libraries, includes, etc. to develop XML and HTML applications
 Summary(ja): XML や HTML アプリケーションを開発するためのライブラリやヘッダ類
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel    = %{version}-%{release}
 Requires: compat32-zlib-devel
@@ -133,20 +137,22 @@ DTDに対応しており、パース時や一度ドキュメントが修正さ
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
+
 %package static
 Summary: Static library for libxml2
 Summary(ja): libxml2 のスタティックライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: libxml2 = %{version}-%{release}
 
 %description static
 Static library for libxml2 provided for specific uses or shaving a few
 microseconds when parsing, do not link to them for generic purpose packages.
 
+
 %package python
 Summary: Python bindings for the libxml2 library
 Summary(ja): libxml2 ライブラリ用の python バインディング
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: python >= 2.2
 
@@ -170,10 +176,11 @@ XMLやHTMLファイルを読み込み、修正、書き込みをサポートし
 DTDに対応しており、パース時や一度ドキュメントが修正された後でも複雑な
 DTDであってもパースと確認が出来ます。
 
+
 %package -n python3-%{name}
 Summary: Python bindings for the libxml2 library
 Summary(ja): libxml2 ライブラリ用の python バインディング
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: python3
 
@@ -197,6 +204,7 @@ XMLやHTMLファイルを読み込み、修正、書き込みをサポートし
 DTDに対応しており、パース時や一度ドキュメントが修正された後でも複雑な
 DTDであってもパースと確認が出来ます。
 
+
 %prep
 %setup -q
 
@@ -208,6 +216,7 @@ DTDであってもパースと確認が出来ます。
 
 find doc -type f -executable -print -exec chmod 0644 {} ';'
 
+
 %build
 mkdir py2 py3
 %global _configure ../configure
@@ -232,7 +241,7 @@ make install -C py3 DESTDIR=$RPM_BUILD_ROOT
 touch -m --reference=$RPM_BUILD_ROOT/%{_includedir}/libxml2/libxml/parser.h $RPM_BUILD_ROOT/%{_bindir}/xml2-config
 
 find %{buildroot} -type f -name '*.la' -print -delete
-rm -vf %{buildroot}{%{python_sitearch},%{python3_sitearch}}/*.a
+rm -vf %{buildroot}{%{python2_sitearch},%{python3_sitearch}}/*.a
 rm -vrf %{buildroot}%{_datadir}/doc/
 #(cd doc/examples ; make clean ; rm -rf .deps Makefile)
 gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
@@ -249,6 +258,7 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
+
 %files
 %defattr(-, root, root)
 %license COPYING Copyright
@@ -287,7 +297,7 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 %doc python/tests/*.py
 %doc doc/*.py
 %doc doc/python.html
-%{python_sitearch}/*
+%{python2_sitearch}/*
 
 %files -n python3-%{name}
 %defattr(-, root, root)
@@ -312,7 +322,11 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 %{_libdir}/*.sh
 %endif
 
+
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-3
+- rebuilt with python-3.8.
+
 * Sat Feb 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-2
 - imported Patch1000 and 1001 from upstream.
 

+ 6 - 5
m/meson/meson-vl.spec

@@ -5,18 +5,18 @@
 Name:           meson
 Summary:        High productivity build system
 Summary(ja):    高生産性ビルドシステム
-Version:        0.54.0
+Version:        0.55.0
 Release:        1%{?_dist_release}
-Group:          Development/Tools
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
-BuildArch:      noarch
 
 License:        ASL 2.0
 URL:            https://mesonbuild.com/
 Source0:        https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        macros.meson
 
+BuildArch:      noarch
 Obsoletes:      %{name}-gui < 0.31.0-3
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -61,11 +61,9 @@ rm -rf "test cases/frameworks/17 mpi"
 
 %build
 %py3_build
-#python3 setup.py build
 
 %install
 %py3_install
-#python3 setup.py install --root %{buildroot}
 
 install -Dpm0644 %{SOURCE1} %{buildroot}%{rpmmacrodir}/macros.%{name}
 
@@ -83,6 +81,9 @@ python3 ./run_tests.py ||:
 %{rpmmacrodir}/macros.*
 
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.55.0-1
+- new upstream release.
+
 * Sun Apr 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.54.0-1
 - new upstream release.
 

+ 59 - 100
n/numpy/numpy-vl.spec

@@ -5,35 +5,31 @@
 
 Name:           numpy
 Summary:        A fast multidimensional array facility for Python
-Version:        1.16.5
+Version:        1.19.1
 Release:        1%{?_dist_release}
-Group:          Development/Languages
-
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        BSD and Python and ASL 2.0
 URL:            https://www.numpy.org/
 Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Source1:        https://numpy.org/doc/1.17/numpy-html-1.16.0.zip
-
-Patch0:         numpy-1.0.1-f2py.patch
-Patch1:         numpy_doublefree.patch
+Source1:        https://docs.scipy.org/doc/numpy/numpy-html-1.17.0.zip
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:  python-devel
-BuildRequires:  python-rpm-macros
-BuildRequires:  python-setuptools
-%if %{with check}
-BuildRequires:  python-pytest
-%endif
-BuildRequires:  Cython
 BuildRequires:  gcc-gfortran gcc
 BuildRequires:  lapack-devel
 BuildRequires:  openblas-devel
+BuildRequires:  python-rpm-macros
 
-Requires:       %{name}-common
+BuildRequires:  python3-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-setuptools
+%if %{with check}
+BuildRequires:  python3-pytest
+%endif
+BuildRequires:  python3-Cython
 
 %description
 NumPy is a general-purpose array-processing package designed to
@@ -48,48 +44,16 @@ basic linear algebra and random number generation. Also included in
 this package is a version of f2py that works properly with NumPy.
 
 
-%package        common
-Summary:        common files for numpy
-Group:          Development/Libraries
-
-%description    common
- This package includes header files for numpy.
-
-
-%package -n     python-numpy-f2py
-Summary:        f2py for numpy
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       python-devel
-Provides:       python-f2py = %{version}-%{release}
-Provides:       numpy-f2py = %{version}-%{release}
-Provides:       f2py = %{version}-%{release}
-Obsoletes:      f2py <= 2.45.241_1927
-Obsoletes:      numpy-f2py < 1.17.0
-
-%description -n python-numpy-f2py
-This package includes a version of f2py that works properly with NumPy.
-
-
 %package -n     python3-numpy
 Summary:        A fast multidimensional array facility for Python
+Group:          programming
 
 License:        BSD
 %{?python_provide:%python_provide python3-numpy}
 Provides:       libnpymath-static = %{version}-%{release}
 Provides:       libnpymath-static%{?_isa} = %{version}-%{release}
-Requires:       %{name}-common = %{version}-%{release}
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-rpm-macros
-BuildRequires:  python3-setuptools
-%if %{with check}
-BuildRequires:  python3-pytest
-%endif
-BuildRequires:  python3-Cython
-BuildRequires:  gcc-gfortran gcc
-BuildRequires:  lapack-devel
-BuildRequires:  openblas-devel
+Obsoletes:      numpy-common < 1.19.0
+Conflicts:      numpy-common < 1.19.0
 
 %description -n python3-numpy
 NumPy is a general-purpose array-processing package designed to
@@ -106,10 +70,10 @@ this package is a version of f2py that works properly with NumPy.
 
 %package -n     python3-numpy-f2py
 Summary:        f2py for numpy
+Group:          programming
 Requires:       python3-numpy%{?_isa} = %{version}-%{release}
 Requires:       python3-devel
 Provides:       python3-f2py = %{version}-%{release}
-Obsoletes:      python3-f2py <= 2.45.241_1927
 %{?python_provide:%python_provide python3-numpy-f2py}
 
 %description -n python3-numpy-f2py
@@ -118,6 +82,7 @@ This package includes a version of f2py that works properly with NumPy.
 
 %package -n     python3-numpy-doc
 Summary:        Documentation for numpy
+Group:          documentation
 Requires:       python3-numpy = %{version}-%{release}
 BuildArch:      noarch
 
@@ -127,10 +92,8 @@ This package provides the complete documentation for NumPy.
 
 %prep
 %setup -q -n %{name}-%{version}
-
 # Force re-cythonization (ifed for PKG-INFO presence in setup.py)
 rm -f PKG-INFO
-
 # Use openblas pthreads as recommended by upstream (see comment in site.cfg.example)
 cat >> site.cfg <<EOF
 [openblas]
@@ -138,18 +101,14 @@ libraries = openblasp
 library_dirs = %{_libdir}
 EOF
 
-%build
-
-env OPENBLAS=%{_libdir} \
-    BLAS=%{_libdir} \
-    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
-    %{__python} setup.py build
 
+%build
 env OPENBLAS=%{_libdir} \
     BLAS=%{_libdir} \
     LAPACK=%{_libdir} CFLAGS="%{optflags}" \
     %{__python3} setup.py build
 
+
 %install
 rm -rf %{buildroot}
 
@@ -158,13 +117,6 @@ pushd docs
 unzip %{SOURCE1}
 popd
 
-env OPENBLAS=%{_libdir} \
-    FFTW=%{_libdir} BLAS=%{_libdir} \
-    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
-    %{__python} setup.py install --root %{buildroot}
-pushd %{buildroot}%{_bindir} &> /dev/null
-ln -s f2py2 f2py.numpy2
-popd &> /dev/null
 
 env OPENBLAS=%{_libdir} \
     FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -176,57 +128,60 @@ popd &> /dev/null
 
 #symlink for includes, BZ 185079
 mkdir -p %{buildroot}%{_includedir}
-#ln -s %{python3_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy
-cp -rf %{buildroot}%{python3_sitearch}/%{name}/core/include/numpy %{buildroot}%{_includedir}/
-
-# Remove doc files. They should in in %doc
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/COMPATIBILITY
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/DEV_README.txt
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/INSTALL.txt
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/LICENSE.txt
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/README.txt
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/THANKS.txt
-rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/site.cfg.example
+ln -s %{python3_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy
+
 
 %if %{with check}
 %check
-pushd doc &> /dev/null
-PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c "import pkg_resources, numpy ; numpy.test()" \
-# don't remove this comment
-popd &> /dev/null
+python3 runtests.py
 %endif
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files common
-%{_includedir}/numpy
 
-%files
-%defattr(-,root,root,-)
-%license LICENSE.txt
-%doc THANKS.txt site.cfg.example
-%dir %{python_sitearch}/%{name}
-%{python_sitearch}/%{name}/*
-%exclude %{python_sitearch}/%{name}/f2py
-%{python_sitearch}/%{name}-*.egg-info
-%exclude %{python3_sitearch}/%{name}/LICENSE.txt
-
-%files -n python-numpy-f2py
-%defattr(-,root,root,-)
-%{_bindir}/f2py2*
-%{_bindir}/f2py.numpy2
-%{python_sitearch}/%{name}/f2py
+%pretrans -n python3-numpy -p <lua>
+-- Define the path to directory being replaced below.
+-- DO NOT add a trailing slash at the end.
+path = "%{_includedir}/numpy"
+st = posix.stat(path)
+if st and st.type == "directory" then
+  status = os.rename(path, path .. ".rpmmoved")
+  if not status then
+    suffix = 0
+    while not status do
+      suffix = suffix + 1
+      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+    end
+    os.rename(path, path .. ".rpmmoved")
+  end
+end
 
 
 %files -n python3-numpy
 %license LICENSE.txt
 %doc THANKS.txt site.cfg.example
 %dir %{python3_sitearch}/%{name}
-%{python3_sitearch}/%{name}/*
-%exclude %{python3_sitearch}/%{name}/f2py
+%{python3_sitearch}/%{name}/*.py*
+%{python3_sitearch}/%{name}/__pycache__
+%{python3_sitearch}/%{name}/core
+%{python3_sitearch}/%{name}/distutils
+%{python3_sitearch}/%{name}/doc
+%{python3_sitearch}/%{name}/fft
+%{python3_sitearch}/%{name}/lib
+%{python3_sitearch}/%{name}/linalg
+%{python3_sitearch}/%{name}/ma
+%{python3_sitearch}/%{name}/random
+%{python3_sitearch}/%{name}/testing
+%{python3_sitearch}/%{name}/tests
+%{python3_sitearch}/%{name}/compat
+%{python3_sitearch}/%{name}/matrixlib
+%{python3_sitearch}/%{name}/polynomial
 %{python3_sitearch}/%{name}-*.egg-info
 %exclude %{python3_sitearch}/%{name}/LICENSE.txt
+%{_includedir}/numpy
+%{python3_sitearch}/%{name}/__init__.pxd
 
 %files -n python3-numpy-f2py
 %{_bindir}/f2py
@@ -240,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.19.1-1
+- new upstream release.
+- built with python3 only.
+
 * Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.16.5-1
 - new upstream release: this version is not newest but final version to suppot python2.
 - added python3 support.

+ 26 - 16
n/nwdiag/nwdiag-vl.spec

@@ -1,26 +1,28 @@
 Summary: simple network-diagram image generator
 Summary(ja): シンプルなテキストからネットワーク図を生成するツール
 Name: nwdiag
-Version: 1.0.4
+Version: 2.0.0
 Release: 1%{?_dist_release}
-Group: Applications/Text
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
 
 License: Apache License 2.0
 URL: http://blockdiag.com/ja/nwdiag/
 Source0: https://pypi.python.org/packages/source/n/nwdiag/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
+BuildRequires: python2-rpm-macros
 Requires: python(abi) = %pyver
 Requires: python >= 2.4
 Requires: blockdiag
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 nwdiag generate network-diagram image file from spec-text file.
 
@@ -28,6 +30,7 @@ nwdiag generate network-diagram image file from spec-text file.
 %package -n python3-nwdiag
 Summary: simple network-diagram image generator
 Summary(ja): シンプルなテキストからネットワーク図を生成するツール
+Group: graphics
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
@@ -41,18 +44,22 @@ nwdiag generate network-diagram image file from spec-text file.
 %prep
 %setup -q
 
+
 %build
-%py_build
+%py2_build
 %py3_build
 
+
 %install
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 
+
 %clean
 %__rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
 %license LICENSE
@@ -60,13 +67,13 @@ nwdiag generate network-diagram image file from spec-text file.
 #%{_bindir}/nwdiag
 #%{_bindir}/packetdiag
 #%{_bindir}/rackdiag
-%{python_sitelib}/nwdiag-%{version}-py*.egg-info
-%{python_sitelib}/nwdiag
-%{python_sitelib}/packetdiag
-%{python_sitelib}/rackdiag
-%{python_sitelib}/nwdiag_sphinxhelper.*
-%{python_sitelib}/packetdiag_sphinxhelper.*
-%{python_sitelib}/rackdiag_sphinxhelper.*
+%{python2_sitelib}/nwdiag-%{version}-py*.egg-info
+%{python2_sitelib}/nwdiag
+%{python2_sitelib}/packetdiag
+%{python2_sitelib}/rackdiag
+%{python2_sitelib}/nwdiag_sphinxhelper.*
+%{python2_sitelib}/packetdiag_sphinxhelper.*
+%{python2_sitelib}/rackdiag_sphinxhelper.*
 
 %files -n python3-nwdiag
 %defattr(-,root,root,-)
@@ -82,6 +89,9 @@ nwdiag generate network-diagram image file from spec-text file.
 
 
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.0-1
+- new upstream release.
+
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.4-1
 - new upstream release.
 - added python3 support.

+ 24 - 21
o/opencv/opencv-vl.spec

@@ -4,11 +4,11 @@
 #global indice   a
 
 Name:           opencv
-Version:        4.3.0
+Version:        4.4.0
 Release:        1%{?_dist_release}
 Summary:        Collection of algorithms for computer vision
 Summary(ja):    コンピュータビジョン用のアルゴリズム集
-Group:          System Environment/Libraries
+Group:          graphics
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -16,12 +16,12 @@ Distribution:   Vine Linux
 License:        BSD
 URL:            https://opencv.org
 
-# Need to remove SIFT/SURF from source tarball, due to legal concerns
-# rm -f opencv-%%{version}/modules/nonfree/src/sift.cpp
-# rm -f opencv-%%{version}/modules/nonfree/src/surf.cpp
-# Removed because we don't use pre-built contribs
-# rm -rf 3rdparty
-#Source0:        http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/%{name}-%{version}%{?indice}.zip
+# RUN opencv-clean.sh TO PREPARE TARBALLS
+#
+# Need to remove copyrighted lena.jpg images from tarball (rhbz#1295173)
+# and SIFT/SURF from tarball, due to legal concerns.
+#
+#Source0:        https://github.com/opencv/opencv/archive/%{version}.tar.gz
 Source0:        %{name}-clean-%{version}.tar.gz
 Source1:        %{name}_contrib-clean-%{version}.tar.gz
 Source2:        %{name}_extra-clean-%{version}.tar.gz
@@ -29,12 +29,9 @@ Source3:        face_landmark_model.dat.xz
 # from https://github.com/opencv/ade/archive/v0.1.1f.zip
 Source4:        b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
 Source5:        xorg.conf
+Source100:      opencv-clean.sh
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
-Patch1:         https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/17431.patch
-Patch2:         https://patch-diff.githubusercontent.com/raw/opencv/opencv_contrib/pull/2549.patch
-# Comment out removed vulkan symbols
-Patch3:         opencv_vulkan.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libtool
@@ -77,6 +74,9 @@ BuildRequires:  gstreamer1-devel
 BuildRequires:  gstreamer1-plugins-base-devel
 #BuildRequires:  xine-lib-devel
 #BuildRequires:  opencl-headers
+BuildRequires:  vulkan-headers
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  xorg-x11-drv-dummy
 
 Requires:       opencv-core = %{version}-%{release}
 
@@ -90,7 +90,7 @@ and Computer Vision algorithms.
 %package        core
 Summary:        OpenCV core libraries
 Summary(ja):    OpenCV コアライブラリ
-Group:          System Environment/Libraries
+Group:          graphics
 Obsoletes:      %{name}-python < %{version}-%{release}
 
 %description    core
@@ -99,7 +99,7 @@ This package contains the OpenCV C/C++ core libraries.
 %package        devel
 Summary:        Development files for using the OpenCV library
 Summary(ja):    OpenCV ライブラリを使用するための開発用ファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       opencv = %{version}-%{release}
 
 %description    devel
@@ -111,7 +111,7 @@ package.
 %package -n     python3-opencv
 Summary:        Python bindings for apps which use OpenCV
 Summary(ja):    OpenCV を使用するアプリケーション用の Python バインディング
-Group:          Development/Libraries
+Group:          programming
 Requires:       opencv = %{version}-%{release}
 Requires:       python3-numpy
 
@@ -121,6 +121,7 @@ This package contains Python bindings for the OpenCV library.
 %package        contrib
 Summary:        OpenCV contributed functionality
 Summary(ja):    寄付された OpenCV の追加機能
+Group:          graphics
 
 %description    contrib
 This package is intended for development of so-called "extra" modules, contribut
@@ -131,6 +132,9 @@ distribution, since the library maintains binary compatibility, and tries
 to provide decent performance and stability.