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 3 years 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:        A language for writing Python extension modules
 Summary(ja):    Python 拡張モジュールを簡単に作成するためのプログラミング言語
 Summary(ja):    Python 拡張モジュールを簡単に作成するためのプログラミング言語
 Name:           Cython
 Name:           Cython
-Version:        0.29.13
+Version:        0.29.21
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Languages
 License:        Apache
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-BuildRequires:	python-devel
-BuildRequires:	python-setuptools
 BuildRequires:	python-rpm-macros
 BuildRequires:	python-rpm-macros
 
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
+BuildRequires:	python-devel
+BuildRequires:	python-setuptools
+BuildRequires:	python2-rpm-macros
 
 
 %description
 %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.
 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
 %package -n python3-Cython
 Summary:        A language for writing Python extension modules
 Summary:        A language for writing Python extension modules
 Summary(ja):    Python 拡張モジュールを簡単に作成するためのプログラミング言語
 Summary(ja):    Python 拡張モジュールを簡単に作成するためのプログラミング言語
-Group:          Development/Languages
+Group:          programming
 BuildRequires:	python3-devel
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-rpm-macros
 BuildRequires:	python3-rpm-macros
@@ -46,16 +47,16 @@ This makes Cython the ideal language for wrapping external C libraries, and for
 
 
 
 
 %prep
 %prep
-%setup -q
+%setup -q -n cython-%{version}
 
 
 %build
 %build
-%{py_build}
+%{py2_build}
 %{py3_build}
 %{py3_build}
 
 
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-%{py_install}
+%{py2_install}
 %{py3_install}
 %{py3_install}
 
 
 
 
@@ -85,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %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
 * Fri Oct 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.29.13-1
 - new upstream release.
 - new upstream release.
 
 

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

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

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

@@ -1,27 +1,28 @@
 Summary: simple activity-diagram image generator
 Summary: simple activity-diagram image generator
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
 Name: actdiag
 Name: actdiag
-Version: 0.5.4
+Version: 2.0.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
 
 
 License: Apache License 2.0
 License: Apache License 2.0
-Group: Applications/Text
 URL: http://blockdiag.com/ja/actdiag/
 URL: http://blockdiag.com/ja/actdiag/
 Source0: https://pypi.python.org/packages/source/a/actdiag/%{name}-%{version}.tar.gz
 Source0: https://pypi.python.org/packages/source/a/actdiag/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 Requires: python >= 2.4
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
 Requires: python(abi) = %pyver
 Requires: blockdiag
 Requires: blockdiag
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 %description
 actdiag generate activity-diagram image file from spec-text file.
 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
 %package -n python3-actdiag
 Summary: simple activity-diagram image generator
 Summary: simple activity-diagram image generator
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
+Group: graphics
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -42,18 +44,22 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %prep
 %prep
 %setup -q
 %setup -q
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
+
 %clean
 %clean
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
@@ -71,7 +77,11 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %{python3_sitelib}/actdiag*
 %{python3_sitelib}/actdiag*
 %{python3_sitelib}/__pycache__/*
 %{python3_sitelib}/__pycache__/*
 
 
+
 %changelog
 %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
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.4-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - 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): ネットワークサービスからの認証を設定するためのコマンドラインツール
 Summary(ja): ネットワークサービスからの認証を設定するためのコマンドラインツール
 Name: authconfig
 Name: authconfig
 Version: 7.0.1
 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
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
+License: GPLv2+
+URL: https://pagure.io/authconfig
 Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 
 
 # fedora patches
 # fedora patches
@@ -26,14 +24,16 @@ Patch1000: authconfig-7.0.1-elogind.patch
 # stop warning flood by tempfile in python3.5
 # stop warning flood by tempfile in python3.5
 Patch1001: authconfig-7.0.1-fix-temp-warning.patch
 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: glib2-devel
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: intltool, gettext
 BuildRequires: intltool, gettext
 Requires: pam
 Requires: pam
 Requires: openssl
 Requires: openssl
+Conflicts: samba-common < 3.0, samba-client < 3.0
+Conflicts: nss_ldap < 254
+Obsoletes: authconfig-gtk < 7.0.0
 
 
 %description 
 %description 
 Authconfig is a command line utility which can configure a workstation
 Authconfig is a command line utility which can configure a workstation
@@ -110,6 +110,9 @@ fi
 %attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
 %attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
 
 
 %changelog
 %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
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-2
 - updated Patch100.
 - updated Patch100.
 
 

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

@@ -1,29 +1,30 @@
 Summary: simple block-diagram image generator
 Summary: simple block-diagram image generator
 Summary(ja): シンプルなテキストからブロック図を生成するツール
 Summary(ja): シンプルなテキストからブロック図を生成するツール
 Name: blockdiag
 Name: blockdiag
-Version: 1.5.4
+Version: 2.0.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Applications/Text
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
 
 
 License: Apache License 2.0
 License: Apache License 2.0
 URL: http://blockdiag.com/ja/
 URL: http://blockdiag.com/ja/
 Source0: https://pypi.python.org/packages/source/b/blockdiag/%{name}-%{version}.tar.gz
 Source0: https://pypi.python.org/packages/source/b/blockdiag/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 Requires: python >= 2.4
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
 Requires: python(abi) = %pyver
 Requires: python-pillow
 Requires: python-pillow
 Requires: python-funcparserlib >= 0.3.4
 Requires: python-funcparserlib >= 0.3.4
 Requires: python-webcolors
 Requires: python-webcolors
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 %description
 blockdiag generate block-diagram image file from spec-text file.
 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
 %package -n python3-blockdiag
 Summary: simple block-diagram image generator
 Summary: simple block-diagram image generator
 Summary(ja): シンプルなテキストからブロック図を生成するツール
 Summary(ja): シンプルなテキストからブロック図を生成するツール
+Group: graphics
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -42,21 +44,26 @@ Requires: python3-webcolors
 %description -n python3-blockdiag
 %description -n python3-blockdiag
 blockdiag generate block-diagram image file from spec-text file.
 blockdiag generate block-diagram image file from spec-text file.
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
+
 %clean
 %clean
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
@@ -75,6 +82,9 @@ blockdiag generate block-diagram image file from spec-text file.
 %{python3_sitelib}/__pycache__/*
 %{python3_sitelib}/__pycache__/*
 
 
 %changelog
 %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
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.4-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - 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_glib_version 	0.70
 %define dbus_version 		1.6
 %define dbus_version 		1.6
-%define pkg_release		3%{?_dist_release}
 
 
 Name:		dbus-python3
 Name:		dbus-python3
 Summary:	D-Bus Python3 Bindings 
 Summary:	D-Bus Python3 Bindings 
 Summary(ja):	D-Bus Python3 バインディング
 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
 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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	dbus-devel >= %{dbus_version}
 BuildRequires:	dbus-devel >= %{dbus_version}
 BuildRequires:	dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:	dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires:	python3-devel
 BuildRequires:	python3-devel
+BuildRequires:	python3-rpm-macros
 Requires:	python3
 Requires:	python3
+Provides:	python3-dbus = %{version}-%{release}
 
 
 %description
 %description
 D-Bus python3 bindings for use with python programs.   
 D-Bus python3 bindings for use with python programs.   
@@ -33,6 +32,7 @@ D-Bus を python3 プログラムから使う為のバインディングです
 %prep
 %prep
 %setup -q -n dbus-python-%{version}
 %setup -q -n dbus-python-%{version}
 
 
+
 %build
 %build
 %configure PYTHON=/usr/bin/python3
 %configure PYTHON=/usr/bin/python3
 %{__make} %{?_smp_mflags}
 %{__make} %{?_smp_mflags}
@@ -54,14 +54,20 @@ rm -f ${RPM_BUILD_ROOT}%{_docdir}/dbus-python/*
 %clean
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
 
 
+
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc COPYING ChangeLog README NEWS
+%license COPYING
+%doc ChangeLog README NEWS
 %{python3_sitearch}/*.so
 %{python3_sitearch}/*.so
-%{python3_sitelib}/dbus/*.py*
-%{python3_sitelib}/dbus/mainloop/*.py*
+%dir %{python3_sitelib}/dbus
+%{python3_sitelib}/dbus/*
+
 
 
 %changelog
 %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
 * Tue Jun 28 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.0-3
 - rebuild with python3-3.5.2
 - rebuild with python3-3.5.2
 
 

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

@@ -1,13 +1,13 @@
 %bcond_with systemd
 %bcond_with systemd
 %bcond_with tests
 %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
 Summary: Ban IPs that make too many password failures
 Name: fail2ban
 Name: fail2ban
 Version: 0.11.1
 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
 Vendor: Project Vine
 Distribution: Vine Linux
 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
 #Patch6: https://patch-diff.githubusercontent.com/raw/fail2ban/fail2ban/pull/2651.patch
 #Patch7: https://github.com/fail2ban/fail2ban/commit/343ec1cdd296530f331637c725bd2bb0549e01e6.patch
 #Patch7: https://github.com/fail2ban/fail2ban/commit/343ec1cdd296530f331637c725bd2bb0549e01e6.patch
 
 
+BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
-BuildArch: noarch
-Requires: iptables, tcp_wrappers
+Requires: iptables, ipset
+#Requires: tcp_wrappers
 Requires: python3-inotify
 Requires: python3-inotify
 %if %{with systemd}
 %if %{with systemd}
 %{?systemd_requires}
 %{?systemd_requires}
@@ -111,6 +112,7 @@ export LANG=ja_JP.UTF-8
 %{__python3} bin/fail2ban-testcases --verbosity=2 --no-network
 %{__python3} bin/fail2ban-testcases --verbosity=2 --no-network
 %endif
 %endif
 
 
+
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
@@ -176,6 +178,9 @@ fi
 
 
 
 
 %changelog
 %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
 * Fri May 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.11.1-1
 - new upstream release.
 - new upstream release.
 - added systemd support (disabled as default).
 - 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: A GNU source-level debugger for C, C++ and other languages.
 Summary(ja): C, C++ その他の言語用 GNU ソースレベルデバッガ
 Summary(ja): C, C++ その他の言語用 GNU ソースレベルデバッガ
 Name: gdb
 Name: gdb
-Version: 9.1
+Version: 9.2
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPL
 License: GPL
-Group: Development/Debuggers
+URL: https://www.gnu.org/software/gdb/
 Source: https://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.xz
 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: ncurses-devel glibc-devel gcc make gzip texinfo expat-devel
 BuildRequires: python3-devel python3-rpm-macros
 BuildRequires: python3-devel python3-rpm-macros
 BuildRequires: zlib-devel
 BuildRequires: zlib-devel
 Requires: install-info
 Requires: install-info
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
 GDB, the GNU debugger, allows you to debug programs written in C, C++,
 and other languages, by executing them in a controlled fashion and
 and other languages, by executing them in a controlled fashion and
@@ -25,9 +26,11 @@ printing their data.
 GDB (GNU デバッガ) は C, C++ その他の言語で書かれたプログラムのデバッグに
 GDB (GNU デバッガ) は C, C++ その他の言語で書かれたプログラムのデバッグに
 使うツールです.プログラムの実行を制御し,データを出力することができます.
 使うツールです.プログラムの実行を制御し,データを出力することができます.
 
 
+
 %prep
 %prep
 %setup -q 
 %setup -q 
 
 
+
 %build
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export CFLAGS="$RPM_OPT_FLAGS"
 rm -fr dejagnu tcl expect 
 rm -fr dejagnu tcl expect 
@@ -44,6 +47,7 @@ cd build
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 make %{?_smp_mflags} info
 make %{?_smp_mflags} info
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 cd build
 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 -f $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/{bfd.mo,opcodes.mo}
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -120,6 +125,9 @@ fi
 
 
 
 
 %changelog
 %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
 * Fri Mar 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.1-1
 - new upstream release.
 - 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:	Graphical interface for advanced GNOME 3 settings
 Summary(ja):	GNOME3の上級設定を行うためのグラフィカルインターフェイス
 Summary(ja):	GNOME3の上級設定を行うためのグラフィカルインターフェイス
 Name:		gnome-tweaks
 Name:		gnome-tweaks
+Group:		desktop-gnome
 Version:	3.34.0
 Version:	3.34.0
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 
 
@@ -37,7 +38,6 @@ Requires:       libsoup
 Requires:       mutter
 Requires:       mutter
 Requires:       pango
 Requires:       pango
 Requires:       python3-pygobject
 Requires:       python3-pygobject
-	
 
 
 Obsoletes:	gnome-tweak-tool < 3.27
 Obsoletes:	gnome-tweak-tool < 3.27
 Provides:	gnome-tweak-tool = %{version}-%{release}
 Provides:	gnome-tweak-tool = %{version}-%{release}
@@ -110,6 +110,9 @@ fi
 
 
 
 
 %changelog
 %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
 * Wed Aug 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.34.0-1
 - new upstream release.
 - 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
 Name:           gobject-introspection
 Version:        1.64.1
 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
 License:        GPLv2+, LGPLv2+, MIT
 URL:            http://live.gnome.org/GObjectIntrospection
 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
 Source0:        https://ftp.gnome.org/pub/gnome/sources/%{name}/%{major_minor}/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -35,19 +36,17 @@ BuildRequires:  meson
 
 
 Requires:       python3-devel
 Requires:       python3-devel
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 GObject Introspection can scan C header and source files in order to
 GObject Introspection can scan C header and source files in order to
 generate introspection "typelib" files.  It also provides an API to examine
 generate introspection "typelib" files.  It also provides an API to examine
 typelib files, useful for creating language bindings among other
 typelib files, useful for creating language bindings among other
 things.
 things.
 
 
+
 %package devel
 %package devel
 Summary: Libraries and headers for gobject-introspection
 Summary: Libraries and headers for gobject-introspection
 Summary(ja): %{name} の開発用ファイル
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %name = %{version}-%{release}
 Requires: %name = %{version}-%{release}
 Requires: glib2-devel
 Requires: glib2-devel
 Requires: libffi-devel
 Requires: libffi-devel
@@ -57,9 +56,11 @@ Obsoletes: gir-repository-devel < 0.6.6
 %description devel
 %description devel
 Libraries and headers for gobject-introspection
 Libraries and headers for gobject-introspection
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
+
 %build
 %build
 %meson \
 %meson \
 	-Ddoctool=disabled \
 	-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 "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
 
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING
 %license COPYING
@@ -108,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.gz
 %{_mandir}/man1/*.gz
 
 
 %changelog
 %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
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.64.1-1
 - new upstream release.
 - new upstream release.
 
 

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

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

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

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

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

@@ -2,8 +2,11 @@
 Summary:	HP printer drivers & utilities for Linux
 Summary:	HP printer drivers & utilities for Linux
 Summary(ja): 	HP プリンタの Linux 向けドライバとユーティリティ
 Summary(ja): 	HP プリンタの Linux 向けドライバとユーティリティ
 Name:		hplip
 Name:		hplip
-Version:	3.18.12
+Version:	3.20.6
 Release: 	1%{?_dist_release}
 Release: 	1%{?_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	kazutaka
 
 
 License:	GPLv2+, MIT and BSD
 License:	GPLv2+, MIT and BSD
 Group:		Applications/Publishing
 Group:		Applications/Publishing
@@ -13,30 +16,32 @@ Source0:	http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar
 #Source1:	hpcups-update-ppds.sh
 #Source1:	hpcups-update-ppds.sh
 Source2:	copy-deviceids.py
 Source2:	copy-deviceids.py
 Source3:	%{name}.appdata.xml
 Source3:	%{name}.appdata.xml
+Source4:	hp-laserjet_cp_1025nw.ppd.gz
+Source5:	hp-laserjet_professional_p_1102w.ppd.gz
 Source1000:	hplip.desktop.vine
 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
 Patch24: hplip-3165-sourceoption.patch
 Patch25: hplip-noernie.patch
 Patch25: hplip-noernie.patch
 Patch26: hplip-appdata.patch
 Patch26: hplip-appdata.patch
@@ -48,39 +53,30 @@ Patch30: hplip-typo.patch
 # code gets fixed.
 # code gets fixed.
 Patch31: hplip-use-binary-str.patch
 Patch31: hplip-use-binary-str.patch
 # m278-m281 doesn't work correctly again
 # 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
 # pgp.mit.edu keyserver got bad connection, so we need to have pool of keyservers
 # to choose (Bz#1641100, launchpad#1799212)
 # 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,
 # QMessagebox call was copy-pasted from Qt4 version, but Qt5 has different arguments,
 # This patch solves most of them
 # 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
 # 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.
 # FPG by two ways - shipping binary blob and non open source code - so it needs to be removed.
 # Patch is taken from Debian.
 # 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
 # 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
 # unusable (crashed on the start). The patch removes usages of variables, which were
 # commented out.
 # commented out.
 # The patch is taken from Debian.
 # 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
 # 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 
 # byte + string variables incompatibility and it is fixed by decoding the 
 # bytes-like variable
 # bytes-like variable
 # part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
 # part of https://bugzilla.redhat.com/show_bug.cgi?id=1666076
 # reported upstream https://bugs.launchpad.net/hplip/+bug/1814272
 # 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
 # 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
 # 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.
 # 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.
 # because their external scripts try to create links in non-existing dirs.
 # Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
 # Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1671513
 # Reported upstream: https://bugs.launchpad.net/hplip/+bug/1814574
 # 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
 # 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
 # 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).
 # have different options, so I'm not sure what author wanted to set).
 # Remove the change for now, it works for user and me.
 # 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
 # hpmud parses mdns txt record badly
 # upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
 # upstream tickets: https://bugs.launchpad.net/hplip/+bug/1797501
 #                   https://bugs.launchpad.net/hplip/+bug/1817214
 #                   https://bugs.launchpad.net/hplip/+bug/1817214
 #                   https://bugs.launchpad.net/hplip/+bug/1821932
 #                   https://bugs.launchpad.net/hplip/+bug/1821932
 # with no response from upstream
 # with no response from upstream
 # Patch taken from Debian https://lists.debian.org/debian-printing/2018/11/msg00049.html
 # 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
 # Part of https://bugzilla.redhat.com/show_bug.cgi?id=1694663
 # It was found out that specific device needs plugin for scanning
 # It was found out that specific device needs plugin for scanning
 # Reported upstream as https://bugs.launchpad.net/hplip/+bug/1822762
 # 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
 # hpcups crashes when a printer needs a plugin and does not have one installed
 # it crashes in destructor, because pointer is not initialized
 # it crashes in destructor, because pointer is not initialized
 # bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
 # bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
 # reported upstream 
 # 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
 # Vine Patches
 Patch70:	hplip-3.11.5-gksu.patch
 Patch70:	hplip-3.11.5-gksu.patch
@@ -136,6 +189,8 @@ BuildRequires:	python3-rpm-macros
 BuildRequires:	python3-cups, cups
 BuildRequires:	python3-cups, cups
 BuildRequires:	sane-devel
 BuildRequires:	sane-devel
 BuildRequires:	python3-qt5
 BuildRequires:	python3-qt5
+BuildRequires:	libappstream-glib
+BuildRequires:	gsettings-desktop-schemas
 # to force to use Qt5
 # to force to use Qt5
 BuildConflicts:	PyQt
 BuildConflicts:	PyQt
 BuildConflicts:	PyQt4
 BuildConflicts:	PyQt4
@@ -143,11 +198,6 @@ BuildConflicts:	PyQt4
 Provides:	hpijs = %{version}-%{release}
 Provides:	hpijs = %{version}-%{release}
 Obsoletes:	hpijs < %{version}-%{release}
 Obsoletes:	hpijs < %{version}-%{release}
 
 
-
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	kazutaka
-
 %description
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
 The Hewlett-Packard Linux Imaging and Printing Project provides
 drivers for HP printers and multi-function peripherals.
 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
 %patch30 -p1 -b .typo
 
 
 %patch31 -p1 -b .use-binary-str
 %patch31 -p1 -b .use-binary-str
-%patch32 -p1 -b .colorlaserjet-mfp-m278-m281
 
 
 # TypeError: 'Error' object does not support indexing (bug #1564770)
 # TypeError: 'Error' object does not support indexing (bug #1564770)
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1718129
 # in python2 it was possible to acces Exception message by index [0].
 # in python2 it was possible to acces Exception message by index [0].
 # in python3 this is no longer possible and it causes TypeError.
 # 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)
 # TypeError: not all arguments converted during string formatting (bug #1566938)
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/616450
 # bug caused by more arguments than argument specifiers in formatted string
 # 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)
 # 'WifiSetupDialog' object has no attribute 'wifiobj' (bug #1626877)
 # upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
 # upstream bug: https://bugs.launchpad.net/hplip/+bug/1752060
 # bug caused by typo in wifisetupdialog wifiObj property call
 # 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
 # have pool of keyservers to choose
-%patch37 -p1 -b .keyserver
+%patch35 -p1 -b .keyserver
 
 
 # TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
 # TypeError: argument 5 has unexpected type 'StandardButtons' (bug #1594602)
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
 # upstream bug: https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/1745383
 # bug caused by typo in QMessageBox constructor call
 # bug caused by typo in QMessageBox constructor call
 # this patch fixes more of those typos - some fixed by tkorbar, some taken from ubuntu fix
 # 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
 # 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
 # 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
 # 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)
 # 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)
 # 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
 # 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
 # vine
 
 
@@ -397,9 +466,14 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
 
 
 rm locatedriver
 rm locatedriver
 
 
+cp -p %{SOURCE4} %{SOURCE5} ppd/hpcups
+
+
 %build
 %build
+# Work-around Makefile.am imperfections.
+sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in
 touch NEWS README AUTHORS ChangeLog
 touch NEWS README AUTHORS ChangeLog
-autoreconf -f -i
+autoreconf -fiv
 %configure \
 %configure \
         --enable-scan-build --enable-gui-build --enable-fax-build \
         --enable-scan-build --enable-gui-build --enable-fax-build \
         --disable-foomatic-rip-hplip-install --enable-pp-build \
         --disable-foomatic-rip-hplip-install --enable-pp-build \
@@ -414,16 +488,12 @@ autoreconf -f -i
 	--with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP \
 	--with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP \
 	PYTHON=%{__python3}
 	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}
 make %{?_smp_mflags}
 
 
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 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
 # Create /run/hplip & /var/lib/hp
 mkdir -p $RPM_BUILD_ROOT/run/hplip
 mkdir -p $RPM_BUILD_ROOT/run/hplip
@@ -468,8 +538,8 @@ rm -f   %{buildroot}%{_bindir}/foomatic-rip \
         %{buildroot}%{_datadir}/applications/hplip.desktop \
         %{buildroot}%{_datadir}/applications/hplip.desktop \
         %{buildroot}%{_datadir}/ppd/HP/*.ppd
         %{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
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps
 install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/16x16/hp_logo.png \
 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 \
 install -p -m644 %{buildroot}%{_datadir}/hplip/data/images/64x64/hp_logo.png \
    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/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
 sed -i -e '/^Categories=/d' hplip.desktop
 # Encoding key is deprecated
 # Encoding key is deprecated
 sed -i -e '/^Encoding=/d' hplip.desktop
 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
         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).
 # Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
 #install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/hpcups-update-ppds
 #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
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 
+
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc COPYING doc/*
 %doc COPYING doc/*
@@ -652,7 +728,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp-toolbox
 %{_bindir}/hp-toolbox
 %{_bindir}/hp-uiscan
 %{_bindir}/hp-uiscan
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
-%{_datadir}/appdata/hplip.appdata.xml
+%{_datadir}/metainfo/hplip.appdata.xml
 # Files
 # Files
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/hplip/check.py*
 %{_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
 %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:	The Linux Infrared Remote Control package.
 Summary(ja):	赤外線リモートコントロールパッケージ
 Summary(ja):	赤外線リモートコントロールパッケージ
 Name:		lirc
 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
 Source1:	lirc.init
 Source2:	lircd.logrotate
 Source2:	lircd.logrotate
 Source3:	lirc.sysconfig
 Source3:	lirc.sysconfig
 Source4:	99-remote-control-lirc.rules
 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
 # Vine patch
 
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	perl
 BuildRequires:	perl
-BuildRequires:	libusb1-devel, python-devel
+BuildRequires:	libusb1-devel
 BuildRequires:	automake libtool
 BuildRequires:	automake libtool
 BuildRequires:	alsa-lib-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libxslt
 BuildRequires:  libxslt
-BuildRequires:  python3
+BuildRequires:	python3-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:	python3-setuptools
 ## Currently not supportd (yet) for Vine Linux
 ## Currently not supportd (yet) for Vine Linux
 #BuildRequires:	libftdi-devel, libirman-devel
 #BuildRequires:	libftdi-devel, libirman-devel
+%if %{with systemd}
+BuildRequires:	systemd-devel
+%{?systemd_requires}
+%else
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager:	owa, kazutaka
+%endif
 
 
 %description
 %description
 LIRC stands for 'Linux Infra-red Remote Control'.
 LIRC stands for 'Linux Infra-red Remote Control'.
@@ -56,7 +68,7 @@ LIRC は 'Linux Infra-red Remote Control' の略です。
 %package	devel
 %package	devel
 Summary:	Development files for LIRC
 Summary:	Development files for LIRC
 Summary(ja):	LIRCを用いた開発用のファイル
 Summary(ja):	LIRCを用いた開発用のファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	lirc = %{version}-%{release}
 Requires:	lirc = %{version}-%{release}
 
 
 %description    devel
 %description    devel
@@ -70,7 +82,7 @@ developing applications that use LIRC.
 
 
 %package -n dkms-%{name}
 %package -n dkms-%{name}
 Summary:	Kernel modules for LIRC
 Summary:	Kernel modules for LIRC
-Group:		System Environment/Kernel
+Group:		system
 Requires(post):	dkms
 Requires(post):	dkms
 Requires(preun):dkms
 Requires(preun):dkms
 
 
@@ -128,47 +140,55 @@ Note that lirc_gpio and lirc_parallel are in packages of their own.
 
 
 
 
 %prep
 %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
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
 
 
 %build
 %build
 autoreconf -if
 autoreconf -if
 %configure \
 %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-driver=userspace \
 	--with-kerneldir=$(pwd)
 	--with-kerneldir=$(pwd)
 
 
-%{__make}
+make LANG=C.utf8 V=0 %{?_smp_mflags}
 
 
 
 
 %install
 %install
 %{__rm} -rf $RPM_BUILD_ROOT __docs
 %{__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 -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 contrib/60-lirc.rules \
 install -Dpm 644 contrib/60-lirc.rules \
     $RPM_BUILD_ROOT%{_udevrulesdir}/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
     $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
 ## For DKMS sub packagtes
 #
 #
@@ -253,7 +273,12 @@ usermod -a -G input lirc &> /dev/null || :
 exit 0
 exit 0
 
 
 %post
 %post
+%if %{with systemd}
+%systemd_post lircd.service lircmd.service
+systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
+%else
 /sbin/chkconfig --add lirc
 /sbin/chkconfig --add lirc
+%endif
 # If we're upgrading, move config files into their new location, if need be
 # If we're upgrading, move config files into their new location, if need be
 if [ $1 -ge 2 ] ; then
 if [ $1 -ge 2 ] ; then
   if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
   if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
@@ -266,16 +291,24 @@ fi
 /sbin/ldconfig
 /sbin/ldconfig
 
 
 %preun
 %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/service lirc stop || :
   /sbin/chkconfig --del lirc || :
   /sbin/chkconfig --del lirc || :
 fi
 fi
+%endif
 /sbin/ldconfig
 /sbin/ldconfig
 
 
 %postun
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart lircd.service lircmd.service
+%else
 if [ "$1" -ge "1" ]; then
 if [ "$1" -ge "1" ]; then
   /sbin/service lirc condrestart || :
   /sbin/service lirc condrestart || :
 fi
 fi
+%endif
 
 
 %post -n dkms-%{name}
 %post -n dkms-%{name}
 dkms add     -m %{name} -v %{version}-%{release} --rpm_safe_upgrade &&
 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
 %license COPYING
 %doc ANNOUNCE AUTHORS ChangeLog NEWS README TODO
 %doc ANNOUNCE AUTHORS ChangeLog NEWS README TODO
 %doc __docs/*
 %doc __docs/*
-%{_initdir}/lirc
 #/etc/logrotate.d/lircd
 #/etc/logrotate.d/lircd
 %dir %{_sysconfdir}/lirc
 %dir %{_sysconfdir}/lirc
 %dir %{_sysconfdir}/lirc/lircd.conf.d
 %dir %{_sysconfdir}/lirc/lircd.conf.d
 %ghost %config(noreplace) %{_sysconfdir}/lirc/*.conf
 %ghost %config(noreplace) %{_sysconfdir}/lirc/*.conf
 %ghost %config(noreplace) %{_sysconfdir}/lirc/irexec.lircrc
 %ghost %config(noreplace) %{_sysconfdir}/lirc/irexec.lircrc
 %ghost %config(noreplace) %{_sysconfdir}/lirc/lircd.conf.d/*
 %ghost %config(noreplace) %{_sysconfdir}/lirc/lircd.conf.d/*
-%config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_bindir}/*
 %{_bindir}/*
 %{_sbindir}/*
 %{_sbindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
@@ -328,7 +359,16 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 %{_mandir}/man?/*
 %{_mandir}/man?/*
 %{_localstatedir}/lib/lirc
 %{_localstatedir}/lib/lirc
 %{_udevrulesdir}/*
 %{_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
 %files devel
 %{_includedir}/lirc/
 %{_includedir}/lirc/
@@ -350,6 +390,10 @@ dkms remove  -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
 
 
 
 
 %changelog
 %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
 * Sat Jul 16 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.4-1
 - updated to 0.9.4.
 - updated to 0.9.4.
 - dropped Patch0.
 - dropped Patch0.

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

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

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

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

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

@@ -1,8 +1,8 @@
+Summary:	Plug-ins implementation convenience library
 Name:		libpeas
 Name:		libpeas
 Version:	1.26.0
 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
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 
 
@@ -121,6 +121,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 
 
 %changelog
 %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
 * Tue May 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.0-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -2,13 +2,15 @@
 
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
-Name: libtdb
 Summary: The tdb library
 Summary: The tdb library
 Summary(ja): TDB ライブラリ
 Summary(ja): TDB ライブラリ
+Name: libtdb
 Version: 1.4.3
 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+
 License: LGPLv3+
 URL: https://tdb.samba.org/
 URL: https://tdb.samba.org/
 Source: https://samba.org/ftp/tdb/tdb-%{version}.tar.gz
 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: python3-devel python3-rpm-macros
 BuildRequires: libtirpc-devel
 BuildRequires: libtirpc-devel
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
 %description
 %description
 A library that implements a trivial database.
 A library that implements a trivial database.
 
 
+
 %package devel
 %package devel
 Summary: Header files need to link the Tdb library
 Summary: Header files need to link the Tdb library
-Group: Development/Libraries
+Group: programming
 Requires: libtdb = %{version}-%{release}
 Requires: libtdb = %{version}-%{release}
 Requires: pkgconfig
 Requires: pkgconfig
 
 
 %description devel
 %description devel
 Header files needed to develop programs that link against the Tdb library.
 Header files needed to develop programs that link against the Tdb library.
 
 
+
 %package -n tdb-tools
 %package -n tdb-tools
 Summary: Tools to manipulate tdb files
 Summary: Tools to manipulate tdb files
 Summary(ja): TDB ファイルを処理するためのツール集
 Summary(ja): TDB ファイルを処理するためのツール集
-Group: Applications/System
+Group: admin-tools
 Requires: libtdb = %{version}-%{release}
 Requires: libtdb = %{version}-%{release}
 
 
 %description -n tdb-tools
 %description -n tdb-tools
 Tools to manage Tdb files
 Tools to manage Tdb files
 
 
+
 %if %{with python2}
 %if %{with python2}
 %package -n python-tdb
 %package -n python-tdb
 Summary: Python bindings for the Tdb library
 Summary: Python bindings for the Tdb library
 Summary(ja): TDB ライブラリの python バインディング
 Summary(ja): TDB ライブラリの python バインディング
-Group: System Environment/Libraries
+Group: programming
 Requires: libtdb = %{version}-%{release}
 Requires: libtdb = %{version}-%{release}
 
 
 %description -n python-tdb
 %description -n python-tdb
 Python bindings for libtdb
 Python bindings for libtdb
-
 %endif
 %endif
 
 
+
 %package -n python3-tdb
 %package -n python3-tdb
 Summary: Python3 bindings for the Tdb library
 Summary: Python3 bindings for the Tdb library
+Group: programming
 Requires: libtdb = %{version}-%{release}
 Requires: libtdb = %{version}-%{release}
 %{?python_provide:%python_provide python3-tdb}
 %{?python_provide:%python_provide python3-tdb}
 %if %{without python2}
 %if %{without python2}
@@ -71,36 +73,37 @@ Obsoletes: python-tdb < %{version}
 %description -n python3-tdb
 %description -n python3-tdb
 Python3 bindings for libtdb
 Python3 bindings for libtdb
 
 
-%if %{build_compat32}
 
 
+%if %{build_compat32}
 %package -n compat32-libtdb
 %package -n compat32-libtdb
 Summary: The TDB library
 Summary: The TDB library
 Summary(ja): TDB ライブラリ
 Summary(ja): TDB ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: libtdb = %{version}-%{release}
 Requires: libtdb = %{version}-%{release}
 
 
 %description -n compat32-libtdb
 %description -n compat32-libtdb
 A library that implements a trivial database.
 A library that implements a trivial database.
-
 %endif
 %endif
 
 
+
 %prep
 %prep
 %setup -q -n tdb-%{version}
 %setup -q -n tdb-%{version}
 
 
+
 %build
 %build
 #./autogen.sh
 #./autogen.sh
 %if %{without python2}
 %if %{without python2}
 export PYTHON=%{__python3}
 export PYTHON=%{__python3}
 %endif
 %endif
 %configure --disable-rpath \
 %configure --disable-rpath \
-	--bundled-libraries=NONE \
-	--builtin-libraries=replace \
 %if %{with python2}
 %if %{with python2}
-	--extra-python=%{__python3}
+	--extra-python=%{__python3} \
 %endif
 %endif
-
+	--bundled-libraries=NONE \
+	--builtin-libraries=replace
 make %{?_smp_mflags} V=1
 make %{?_smp_mflags} V=1
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 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
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %{_libdir}/libtdb.so.*
 %{_libdir}/libtdb.so.*
@@ -146,35 +151,32 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitearch}/*
 %{python3_sitearch}/*
 
 
 %if %{build_compat32}
 %if %{build_compat32}
-
 %files -n compat32-libtdb
 %files -n compat32-libtdb
 %attr(755,root,root) %{_libdir}/libtdb.so.*
 %attr(755,root,root) %{_libdir}/libtdb.so.*
-
 %endif
 %endif
 
 
-%post -p /sbin/ldconfig
 
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
 %if %{with python2}
 %if %{with python2}
 %post -n python-tdb -p /sbin/ldconfig
 %post -n python-tdb -p /sbin/ldconfig
-
 %postun -n python-tdb -p /sbin/ldconfig
 %postun -n python-tdb -p /sbin/ldconfig
-
 %endif
 %endif
 
 
 %post -n python3-tdb -p /sbin/ldconfig
 %post -n python3-tdb -p /sbin/ldconfig
-
 %postun -n python3-tdb -p /sbin/ldconfig
 %postun -n python3-tdb -p /sbin/ldconfig
 
 
 %if %build_compat32
 %if %build_compat32
-
 %post -n compat32-libtdb -p /sbin/ldconfig
 %post -n compat32-libtdb -p /sbin/ldconfig
 %postun -n compat32-libtdb -p /sbin/ldconfig
 %postun -n compat32-libtdb -p /sbin/ldconfig
-
 %endif
 %endif
 
 
+
 %changelog
 %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
 * Tue Mar 31 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.3-1
 - new upstream release.
 - 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 サポートを提供するライブラリ
 Summary(ja): XML や HTML サポートを提供するライブラリ
 Name: libxml2
 Name: libxml2
 Version: 2.9.10
 Version: 2.9.10
-Release: 2%{_dist_release}
+Release: 3%{_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT
 License: MIT
-Group: System Environment/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
 
 
 Patch0: libxml2-multilib.patch
 Patch0: libxml2-multilib.patch
@@ -16,7 +19,8 @@ Patch1000:      CVE-2019-20388.patch
 Patch1001:      CVE-2020-7595.patch
 Patch1001:      CVE-2020-7595.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 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: python3 python3-devel python3-rpm-macros
 BuildRequires: libxcrypt-devel
 BuildRequires: libxcrypt-devel
 BuildRequires: zlib-devel
 BuildRequires: zlib-devel
@@ -24,9 +28,6 @@ BuildRequires: pkgconfig
 
 
 URL: http://xmlsoft.org/
 URL: http://xmlsoft.org/
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 %description
 %description
@@ -48,10 +49,11 @@ URI library.
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
 
+
 %package -n compat32-%{name}
 %package -n compat32-%{name}
 Summary: Library providing XML and HTML support
 Summary: Library providing XML and HTML support
 Summary(ja): XML や HTML サポートを提供するライブラリ
 Summary(ja): XML や HTML サポートを提供するライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 
 %description -n compat32-%{name}
 %description -n compat32-%{name}
@@ -73,10 +75,11 @@ URI library.
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
 
+
 %package devel
 %package devel
 Summary: Libraries, includes, etc. to develop XML and HTML applications
 Summary: Libraries, includes, etc. to develop XML and HTML applications
 Summary(ja): XML や HTML アプリケーションを開発するためのライブラリやヘッダ類
 Summary(ja): XML や HTML アプリケーションを開発するためのライブラリやヘッダ類
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel
 Requires: zlib-devel
 Requires: pkgconfig
 Requires: pkgconfig
@@ -103,10 +106,11 @@ DTDに対応しており、パース時や一度ドキュメントが修正さ
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
 
+
 %package -n compat32-%{name}-devel
 %package -n compat32-%{name}-devel
 Summary: Libraries, includes, etc. to develop XML and HTML applications
 Summary: Libraries, includes, etc. to develop XML and HTML applications
 Summary(ja): XML や HTML アプリケーションを開発するためのライブラリやヘッダ類
 Summary(ja): XML や HTML アプリケーションを開発するためのライブラリやヘッダ類
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel    = %{version}-%{release}
 Requires: %{name}-devel    = %{version}-%{release}
 Requires: compat32-zlib-devel
 Requires: compat32-zlib-devel
@@ -133,20 +137,22 @@ DTDに対応しており、パース時や一度ドキュメントが修正さ
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 選択したサブノードやレンジの実装に組み込まれたXPathやXPointerを使うことが
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 出来ます。HTTPやFTPモジュールやURIライブラリを使って柔軟な入力/出力が可能です。
 
 
+
 %package static
 %package static
 Summary: Static library for libxml2
 Summary: Static library for libxml2
 Summary(ja): libxml2 のスタティックライブラリ
 Summary(ja): libxml2 のスタティックライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: libxml2 = %{version}-%{release}
 Requires: libxml2 = %{version}-%{release}
 
 
 %description static
 %description static
 Static library for libxml2 provided for specific uses or shaving a few
 Static library for libxml2 provided for specific uses or shaving a few
 microseconds when parsing, do not link to them for generic purpose packages.
 microseconds when parsing, do not link to them for generic purpose packages.
 
 
+
 %package python
 %package python
 Summary: Python bindings for the libxml2 library
 Summary: Python bindings for the libxml2 library
 Summary(ja): libxml2 ライブラリ用の python バインディング
 Summary(ja): libxml2 ライブラリ用の python バインディング
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: python >= 2.2
 Requires: python >= 2.2
 
 
@@ -170,10 +176,11 @@ XMLやHTMLファイルを読み込み、修正、書き込みをサポートし
 DTDに対応しており、パース時や一度ドキュメントが修正された後でも複雑な
 DTDに対応しており、パース時や一度ドキュメントが修正された後でも複雑な
 DTDであってもパースと確認が出来ます。
 DTDであってもパースと確認が出来ます。
 
 
+
 %package -n python3-%{name}
 %package -n python3-%{name}
 Summary: Python bindings for the libxml2 library
 Summary: Python bindings for the libxml2 library
 Summary(ja): libxml2 ライブラリ用の python バインディング
 Summary(ja): libxml2 ライブラリ用の python バインディング
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: python3
 Requires: python3
 
 
@@ -197,6 +204,7 @@ XMLやHTMLファイルを読み込み、修正、書き込みをサポートし
 DTDに対応しており、パース時や一度ドキュメントが修正された後でも複雑な
 DTDに対応しており、パース時や一度ドキュメントが修正された後でも複雑な
 DTDであってもパースと確認が出来ます。
 DTDであってもパースと確認が出来ます。
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
@@ -208,6 +216,7 @@ DTDであってもパースと確認が出来ます。
 
 
 find doc -type f -executable -print -exec chmod 0644 {} ';'
 find doc -type f -executable -print -exec chmod 0644 {} ';'
 
 
+
 %build
 %build
 mkdir py2 py3
 mkdir py2 py3
 %global _configure ../configure
 %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
 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
 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/
 rm -vrf %{buildroot}%{_datadir}/doc/
 #(cd doc/examples ; make clean ; rm -rf .deps Makefile)
 #(cd doc/examples ; make clean ; rm -rf .deps Makefile)
 gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 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
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
 
+
 %files
 %files
 %defattr(-, root, root)
 %defattr(-, root, root)
 %license COPYING Copyright
 %license COPYING Copyright
@@ -287,7 +297,7 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 %doc python/tests/*.py
 %doc python/tests/*.py
 %doc doc/*.py
 %doc doc/*.py
 %doc doc/python.html
 %doc doc/python.html
-%{python_sitearch}/*
+%{python2_sitearch}/*
 
 
 %files -n python3-%{name}
 %files -n python3-%{name}
 %defattr(-, root, root)
 %defattr(-, root, root)
@@ -312,7 +322,11 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz
 %{_libdir}/*.sh
 %{_libdir}/*.sh
 %endif
 %endif
 
 
+
 %changelog
 %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
 * Sat Feb 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-2
 - imported Patch1000 and 1001 from upstream.
 - imported Patch1000 and 1001 from upstream.
 
 

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

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

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

@@ -5,35 +5,31 @@
 
 
 Name:           numpy
 Name:           numpy
 Summary:        A fast multidimensional array facility for Python
 Summary:        A fast multidimensional array facility for Python
-Version:        1.16.5
+Version:        1.19.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Group:          Development/Languages
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 License:        BSD and Python and ASL 2.0
 License:        BSD and Python and ASL 2.0
 URL:            https://www.numpy.org/
 URL:            https://www.numpy.org/
 Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 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
 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:  gcc-gfortran gcc
 BuildRequires:  lapack-devel
 BuildRequires:  lapack-devel
 BuildRequires:  openblas-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
 %description
 NumPy is a general-purpose array-processing package designed to
 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.
 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
 %package -n     python3-numpy
 Summary:        A fast multidimensional array facility for Python
 Summary:        A fast multidimensional array facility for Python
+Group:          programming
 
 
 License:        BSD
 License:        BSD
 %{?python_provide:%python_provide python3-numpy}
 %{?python_provide:%python_provide python3-numpy}
 Provides:       libnpymath-static = %{version}-%{release}
 Provides:       libnpymath-static = %{version}-%{release}
 Provides:       libnpymath-static%{?_isa} = %{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
 %description -n python3-numpy
 NumPy is a general-purpose array-processing package designed to
 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
 %package -n     python3-numpy-f2py
 Summary:        f2py for numpy
 Summary:        f2py for numpy
+Group:          programming
 Requires:       python3-numpy%{?_isa} = %{version}-%{release}
 Requires:       python3-numpy%{?_isa} = %{version}-%{release}
 Requires:       python3-devel
 Requires:       python3-devel
 Provides:       python3-f2py = %{version}-%{release}
 Provides:       python3-f2py = %{version}-%{release}
-Obsoletes:      python3-f2py <= 2.45.241_1927
 %{?python_provide:%python_provide python3-numpy-f2py}
 %{?python_provide:%python_provide python3-numpy-f2py}
 
 
 %description -n 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
 %package -n     python3-numpy-doc
 Summary:        Documentation for numpy
 Summary:        Documentation for numpy
+Group:          documentation
 Requires:       python3-numpy = %{version}-%{release}
 Requires:       python3-numpy = %{version}-%{release}
 BuildArch:      noarch
 BuildArch:      noarch
 
 
@@ -127,10 +92,8 @@ This package provides the complete documentation for NumPy.
 
 
 %prep
 %prep
 %setup -q -n %{name}-%{version}
 %setup -q -n %{name}-%{version}
-
 # Force re-cythonization (ifed for PKG-INFO presence in setup.py)
 # Force re-cythonization (ifed for PKG-INFO presence in setup.py)
 rm -f PKG-INFO
 rm -f PKG-INFO
-
 # Use openblas pthreads as recommended by upstream (see comment in site.cfg.example)
 # Use openblas pthreads as recommended by upstream (see comment in site.cfg.example)
 cat >> site.cfg <<EOF
 cat >> site.cfg <<EOF
 [openblas]
 [openblas]
@@ -138,18 +101,14 @@ libraries = openblasp
 library_dirs = %{_libdir}
 library_dirs = %{_libdir}
 EOF
 EOF
 
 
-%build
-
-env OPENBLAS=%{_libdir} \
-    BLAS=%{_libdir} \
-    LAPACK=%{_libdir} CFLAGS="%{optflags}" \
-    %{__python} setup.py build
 
 
+%build
 env OPENBLAS=%{_libdir} \
 env OPENBLAS=%{_libdir} \
     BLAS=%{_libdir} \
     BLAS=%{_libdir} \
     LAPACK=%{_libdir} CFLAGS="%{optflags}" \
     LAPACK=%{_libdir} CFLAGS="%{optflags}" \
     %{__python3} setup.py build
     %{__python3} setup.py build
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
@@ -158,13 +117,6 @@ pushd docs
 unzip %{SOURCE1}
 unzip %{SOURCE1}
 popd
 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} \
 env OPENBLAS=%{_libdir} \
     FFTW=%{_libdir} BLAS=%{_libdir} \
     FFTW=%{_libdir} BLAS=%{_libdir} \
@@ -176,57 +128,60 @@ popd &> /dev/null
 
 
 #symlink for includes, BZ 185079
 #symlink for includes, BZ 185079
 mkdir -p %{buildroot}%{_includedir}
 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}
 %if %{with check}
 %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
 %endif
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 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
 %files -n python3-numpy
 %license LICENSE.txt
 %license LICENSE.txt
 %doc THANKS.txt site.cfg.example
 %doc THANKS.txt site.cfg.example
 %dir %{python3_sitearch}/%{name}
 %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
 %{python3_sitearch}/%{name}-*.egg-info
 %exclude %{python3_sitearch}/%{name}/LICENSE.txt
 %exclude %{python3_sitearch}/%{name}/LICENSE.txt
+%{_includedir}/numpy
+%{python3_sitearch}/%{name}/__init__.pxd
 
 
 %files -n python3-numpy-f2py
 %files -n python3-numpy-f2py
 %{_bindir}/f2py
 %{_bindir}/f2py
@@ -240,6 +195,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %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
 * 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.
 - new upstream release: this version is not newest but final version to suppot python2.
 - added python3 support.
 - added python3 support.

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

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

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

@@ -4,11 +4,11 @@
 #global indice   a
 #global indice   a
 
 
 Name:           opencv
 Name:           opencv
-Version:        4.3.0
+Version:        4.4.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Collection of algorithms for computer vision
 Summary:        Collection of algorithms for computer vision
 Summary(ja):    コンピュータビジョン用のアルゴリズム集
 Summary(ja):    コンピュータビジョン用のアルゴリズム集
-Group:          System Environment/Libraries
+Group:          graphics
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -16,12 +16,12 @@ Distribution:   Vine Linux
 License:        BSD
 License:        BSD
 URL:            https://opencv.org
 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
 Source0:        %{name}-clean-%{version}.tar.gz
 Source1:        %{name}_contrib-clean-%{version}.tar.gz
 Source1:        %{name}_contrib-clean-%{version}.tar.gz
 Source2:        %{name}_extra-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
 # from https://github.com/opencv/ade/archive/v0.1.1f.zip
 Source4:        b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
 Source4:        b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
 Source5:        xorg.conf
 Source5:        xorg.conf
+Source100:      opencv-clean.sh
 
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libtool
 BuildRequires:  libtool
@@ -77,6 +74,9 @@ BuildRequires:  gstreamer1-devel
 BuildRequires:  gstreamer1-plugins-base-devel
 BuildRequires:  gstreamer1-plugins-base-devel
 #BuildRequires:  xine-lib-devel
 #BuildRequires:  xine-lib-devel
 #BuildRequires:  opencl-headers
 #BuildRequires:  opencl-headers
+BuildRequires:  vulkan-headers
+BuildRequires:  mesa-dri-drivers
+BuildRequires:  xorg-x11-drv-dummy
 
 
 Requires:       opencv-core = %{version}-%{release}
 Requires:       opencv-core = %{version}-%{release}
 
 
@@ -90,7 +90,7 @@ and Computer Vision algorithms.
 %package        core
 %package        core
 Summary:        OpenCV core libraries
 Summary:        OpenCV core libraries
 Summary(ja):    OpenCV コアライブラリ
 Summary(ja):    OpenCV コアライブラリ
-Group:          System Environment/Libraries
+Group:          graphics
 Obsoletes:      %{name}-python < %{version}-%{release}
 Obsoletes:      %{name}-python < %{version}-%{release}
 
 
 %description    core
 %description    core
@@ -99,7 +99,7 @@ This package contains the OpenCV C/C++ core libraries.
 %package        devel
 %package        devel
 Summary:        Development files for using the OpenCV library
 Summary:        Development files for using the OpenCV library
 Summary(ja):    OpenCV ライブラリを使用するための開発用ファイル
 Summary(ja):    OpenCV ライブラリを使用するための開発用ファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       opencv = %{version}-%{release}
 Requires:       opencv = %{version}-%{release}
 
 
 %description    devel
 %description    devel
@@ -111,7 +111,7 @@ package.
 %package -n     python3-opencv
 %package -n     python3-opencv
 Summary:        Python bindings for apps which use OpenCV
 Summary:        Python bindings for apps which use OpenCV
 Summary(ja):    OpenCV を使用するアプリケーション用の Python バインディング
 Summary(ja):    OpenCV を使用するアプリケーション用の Python バインディング
-Group:          Development/Libraries
+Group:          programming
 Requires:       opencv = %{version}-%{release}
 Requires:       opencv = %{version}-%{release}
 Requires:       python3-numpy
 Requires:       python3-numpy
 
 
@@ -121,6 +121,7 @@ This package contains Python bindings for the OpenCV library.
 %package        contrib
 %package        contrib
 Summary:        OpenCV contributed functionality
 Summary:        OpenCV contributed functionality
 Summary(ja):    寄付された OpenCV の追加機能
 Summary(ja):    寄付された OpenCV の追加機能
+Group:          graphics
 
 
 %description    contrib
 %description    contrib
 This package is intended for development of so-called "extra" modules, contribut
 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.
 to provide decent performance and stability.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -a1 -a2
 %setup -q -a1 -a2
 # we don't use pre-built contribs except quirc
 # we don't use pre-built contribs except quirc
@@ -141,12 +145,6 @@ shopt -u extglob
 popd &>/dev/null
 popd &>/dev/null
 
 
 %patch0 -p1 -b .install_3rdparty_licenses
 %patch0 -p1 -b .install_3rdparty_licenses
-%patch1 -p1
-%patch3 -p1
-
-pushd %{name}_contrib-%{version}
-%patch2 -p1
-popd
 
 
 # Install ADE, needed for opencv_gapi
 # Install ADE, needed for opencv_gapi
 mkdir -p .cache/ade
 mkdir -p .cache/ade
@@ -218,6 +216,7 @@ popd
         %{?with_va: -DWITH_VA=ON } \
         %{?with_va: -DWITH_VA=ON } \
         -DWITH_VTK=OFF \
         -DWITH_VTK=OFF \
         -DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \
         -DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \
+        -DWITH_VULKAN=ON -DVULKAN_INCLUDE_DIRS=%{_includedir}/vulkan \
         ..
         ..
  
  
 make VERBOSE=1 %{?_smp_mflags}
 make VERBOSE=1 %{?_smp_mflags}
@@ -349,6 +348,10 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.4.0-1
+- new upstream release.
+- enabled vulkan compute backend
+
 * Tue Jun 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.3.0-1
 * Tue Jun 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.3.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 10 - 46
p/pycairo/pycairo-vl.spec

@@ -1,51 +1,31 @@
-%bcond_without python2
 %bcond_without python3
 %bcond_without python3
 
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 Name: pycairo
 Name: pycairo
 Summary: Python bindings for the cairo library
 Summary: Python bindings for the cairo library
 Summary(ja): cairo ライブラリの Python バインディング
 Summary(ja): cairo ライブラリの Python バインディング
-Version: 1.18.2
+Version: 1.19.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: programming
 
 
-Group: Development/Languages
 License: LGPLv2
 License: LGPLv2
-URL: http://cairographics.org/pycairo
-
-Source: pycairo-%{version}.tar.gz
+URL: https://cairographics.org/pycairo
+Source: https://github.com/pygobject/pycairo/releases/download/v%{version}/pycairo-%{version}.tar.gz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cairo-devel >= 1.8.10
 BuildRequires: cairo-devel >= 1.8.10
-%if %{with python2}
-BuildRequires: python-devel >= 2.6
-BuildRequires: python-setuptools
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
-%endif
 BuildRequires: pkgconfig
 BuildRequires: pkgconfig
 Requires: cairo >= 1.8.10
 Requires: cairo >= 1.8.10
 
 
 %description
 %description
 Python bindings for the cairo library.
 Python bindings for the cairo library.
 
 
-%if %{with python2}
-%package devel
-Summary: Libraries and headers for pycairo
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: cairo-devel
-Requires: python-devel
-
-%description devel
-This package contains files required to build wrappers for cairo add-on
-libraries so that they interoperate with pycairo.
-%endif
-
 
 
 %if %{with python3}
 %if %{with python3}
 %package -n python3-pycairo
 %package -n python3-pycairo
 Summary: Python3 bindings for the cairo library
 Summary: Python3 bindings for the cairo library
 Summary(ja): cairo ライブラリの Python3 バインディング
 Summary(ja): cairo ライブラリの Python3 バインディング
+Group: programming
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -56,7 +36,7 @@ Python3 bindings for the cairo library.
 
 
 %package -n python3-pycairo-devel
 %package -n python3-pycairo-devel
 Summary: Libraries and headers for pycairo
 Summary: Libraries and headers for pycairo
-Group: Development/Libraries
+Group: programming
 Requires: python3-pycairo = %{version}-%{release}
 Requires: python3-pycairo = %{version}-%{release}
 Requires: cairo-devel
 Requires: cairo-devel
 Requires: python3-devel
 Requires: python3-devel
@@ -71,9 +51,6 @@ libraries so that they interoperate with pycairo.
 %setup -q 
 %setup -q 
 
 
 %build
 %build
-%if %{with python2}
-%py_build
-%endif
 %if %{with python3}
 %if %{with python3}
 %py3_build
 %py3_build
 %endif
 %endif
@@ -81,9 +58,6 @@ libraries so that they interoperate with pycairo.
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-%if %{with python2}
-%py_install
-%endif
 %if %{with python3}
 %if %{with python3}
 %py3_install
 %py3_install
 %endif
 %endif
@@ -95,20 +69,6 @@ find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 
 
-%if %{with python2}
-%files
-%defattr(-,root,root,-)
-%license COPYING*
-%doc NEWS README*
-%{python_sitearch}/*
-
-%files devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/pycairo/
-%{_includedir}/pycairo/pycairo.h
-%{_libdir}/pkgconfig/pycairo.pc
-%endif
-
 %if %{with python3}
 %if %{with python3}
 %files -n python3-pycairo
 %files -n python3-pycairo
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -125,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.19.1-1
+- new upstream release.
+- built with python3 only.
+
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.2-1
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.2-1
 - new upstream release.
 - new upstream release.
 
 

+ 15 - 7
p/pygobject3/pygobject3-vl.spec

@@ -4,9 +4,9 @@
 Name: pygobject3
 Name: pygobject3
 Summary: Python bindings for GObject Introspection
 Summary: Python bindings for GObject Introspection
 Summary(ja): GObject Introspection の Python バインディング
 Summary(ja): GObject Introspection の Python バインディング
-Version: 3.34.0
+Version: 3.36.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Development/Languages
+Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
@@ -21,11 +21,12 @@ BuildRequires: python-devel >= 2.6
 BuildRequires: libffi-devel
 BuildRequires: libffi-devel
 BuildRequires: libtool, automake
 BuildRequires: libtool, automake
 BuildRequires: gobject-introspection-devel >= 0.9.8
 BuildRequires: gobject-introspection-devel >= 0.9.8
+BuildRequires: python-rpm-macros
 %if %{with python2}
 %if %{with python2}
 BuildRequires: python-devel >= 2.6
 BuildRequires: python-devel >= 2.6
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
-BuildRequires: pycairo-devel >= 1.8.10
+BuildRequires: python2-rpm-macros
+BuildRequires: python2-pycairo-devel >= 1.8.10
 %endif
 %endif
 
 
 Obsoletes:	%{name}-doc < 3.10.0
 Obsoletes:	%{name}-doc < 3.10.0
@@ -37,7 +38,7 @@ for use in Python programs.
 
 
 %package devel
 %package devel
 Summary: Development files for building add-on libraries
 Summary: Development files for building add-on libraries
-Group: Development/Libraries
+Group: programming
 Provides: python3-pygobject-devel = %{version}-%{release}
 Provides: python3-pygobject-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel
 Requires: glib2-devel
@@ -53,6 +54,7 @@ pygobject-based libraries such as pygtk2.
 %package -n python3-pygobject
 %package -n python3-pygobject
 Summary: Python3 bindings for GObject Introspection
 Summary: Python3 bindings for GObject Introspection
 Summary(ja): GObject Introspection の Python3 バインディング
 Summary(ja): GObject Introspection の Python3 バインディング
+Group: programming
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -64,6 +66,7 @@ python3-pygobject provides a convenient wrapper for the GObject library
 for use in Python3 programs.
 for use in Python3 programs.
 %endif
 %endif
 
 
+
 %prep
 %prep
 %setup -q -n pygobject-%{version}
 %setup -q -n pygobject-%{version}
 
 
@@ -93,7 +96,8 @@ rm -fr $RPM_BUILD_ROOT
 %if %{with python2}
 %if %{with python2}
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README ChangeLog
+%license COPYING
+%doc NEWS README*
 %doc examples
 %doc examples
 %{_libdir}/python2.7/site-packages/pygtkcompat
 %{_libdir}/python2.7/site-packages/pygtkcompat
 %{python_sitearch}/*.egg-info
 %{python_sitearch}/*.egg-info
@@ -108,7 +112,8 @@ rm -fr $RPM_BUILD_ROOT
 %if %{with python3}
 %if %{with python3}
 %files -n python3-pygobject
 %files -n python3-pygobject
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README ChangeLog
+%license COPYING
+%doc NEWS README*
 %{python3_sitearch}/pygtkcompat
 %{python3_sitearch}/pygtkcompat
 %{python3_sitearch}/*.egg-info
 %{python3_sitearch}/*.egg-info
 %{python3_sitearch}/gi
 %{python3_sitearch}/gi
@@ -116,6 +121,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.1-1
+- new upstream release.
+
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.34.0-1
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.34.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 29 - 21
p/pyparsing/pyparsing-vl.spec

@@ -1,34 +1,38 @@
 Name:           pyparsing
 Name:           pyparsing
-Version:        2.3.0
+Version:        2.4.7
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        An object-oriented approach to text processing
 Summary:        An object-oriented approach to text processing
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Libraries
 License:        MIT
 License:        MIT
 URL:            https://github.com/pyparsing/pyparsing/
 URL:            https://github.com/pyparsing/pyparsing/
-Source0:        https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-2.3.0.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+Source0:        https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz
+
 BuildArch:      noarch
 BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires:  python-rpm-macros
 
 
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
-BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
+
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 pyparsing is a module that can be used to easily and directly configure syntax
 pyparsing is a module that can be used to easily and directly configure syntax
 definitions for any number of text parsing applications.
 definitions for any number of text parsing applications.
 
 
+
 %package -n python-pyparsing
 %package -n python-pyparsing
 Summary:        An object-oriented approach to text processing
 Summary:        An object-oriented approach to text processing
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
-Group:          Development/Libraries
+Group:          programming
 Requires:       python
 Requires:       python
 Provides:       pyparsing = %{version}-%{release}
 Provides:       pyparsing = %{version}-%{release}
 Obsoletes:      pyparsing < %{version}
 Obsoletes:      pyparsing < %{version}
@@ -37,16 +41,18 @@ Obsoletes:      pyparsing < %{version}
 pyparsing is a module that can be used to easily and directly configure syntax
 pyparsing is a module that can be used to easily and directly configure syntax
 definitions for any number of text parsing applications.
 definitions for any number of text parsing applications.
 
 
+
 %package -n python3-pyparsing
 %package -n python3-pyparsing
 Summary:        An object-oriented approach to text processing
 Summary:        An object-oriented approach to text processing
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
-Group:          Development/Libraries
+Group:          programming
 Requires:       python3
 Requires:       python3
 
 
 %description -n python3-pyparsing
 %description -n python3-pyparsing
 pyparsing is a module that can be used to easily and directly configure syntax
 pyparsing is a module that can be used to easily and directly configure syntax
 definitions for any number of text parsing applications.
 definitions for any number of text parsing applications.
 
 
+
 %prep
 %prep
 %setup -qc -n pyparsing-%{version}
 %setup -qc -n pyparsing-%{version}
 mv pyparsing-%{version} python2
 mv pyparsing-%{version} python2
@@ -56,14 +62,13 @@ pushd python2
 perl -pi -e 's/\r//' LICENSE
 perl -pi -e 's/\r//' LICENSE
 perl -pi -e 's/\r//' CHANGES
 perl -pi -e 's/\r//' CHANGES
 perl -pi -e 's/\r//' README*
 perl -pi -e 's/\r//' README*
-cp -a LICENSE CHANGES README* htmldoc examples HowToUsePyparsing.html ../
-cp pyparsingClassDiagram.JPG ../pyparsingClassDiagram.jpg
-cp pyparsingClassDiagram.PNG ../pyparsingClassDiagram.png
+cp -a LICENSE CHANGES README* docs examples ../
 popd
 popd
 
 
+
 %build
 %build
 pushd python2
 pushd python2
-%py_build
+%py2_build
 popd
 popd
 pushd python3
 pushd python3
 %py3_build
 %py3_build
@@ -73,34 +78,37 @@ popd
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 pushd python2
 pushd python2
-%py_install
+%py2_install
 popd
 popd
 pushd python3
 pushd python3
 %py3_install
 %py3_install
 popd
 popd
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %files -n python-pyparsing
 %files -n python-pyparsing
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
-%doc CHANGES README* htmldoc examples
-%doc HowToUsePyparsing.html pyparsingClassDiagram.jpg pyparsingClassDiagram.png
-%{python_sitelib}/pyparsing*egg-info
-%{python_sitelib}/pyparsing.py*
+%doc CHANGES README* docs examples
+%{python2_sitelib}/pyparsing*egg-info
+%{python2_sitelib}/pyparsing.py*
 
 
 %files -n python3-pyparsing
 %files -n python3-pyparsing
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
-%doc CHANGES README* htmldoc examples
-%doc HowToUsePyparsing.html pyparsingClassDiagram.jpg pyparsingClassDiagram.png
+%doc CHANGES README* docs examples
 %{python3_sitelib}/pyparsing*egg-info
 %{python3_sitelib}/pyparsing*egg-info
 %{python3_sitelib}/pyparsing.py*
 %{python3_sitelib}/pyparsing.py*
 %{python3_sitelib}/__pycache__/pyparsing.*
 %{python3_sitelib}/__pycache__/pyparsing.*
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
 - new upstream release.
 - new upstream release.
 - changed naming-rule.
 - changed naming-rule.

+ 11 - 9
p/pyparted/pyparted-vl.spec

@@ -1,23 +1,23 @@
 Summary:        Python module for GNU parted
 Summary:        Python module for GNU parted
 Summary(ja):    parted の python モジュール
 Summary(ja):    parted の python モジュール
 Name:           pyparted
 Name:           pyparted
-Version:        3.11.2
+Version:        3.11.4
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-License:        GPLv2+
-Group:          System Environment/Libraries
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
-Source0: https://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz
+License:        GPLv2+
+URL:            https://github.com/dcantrell/pyparted
+Source0:        https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
-# https://github.com/dcantrell/pyparted/issues/57
-Patch0: use-decimal-instead-of-float.patch
+BuildRequires: python-rpm-macros
 
 
 BuildRequires: python-devel
 BuildRequires: python-devel
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 BuildRequires: python-six
 BuildRequires: python-six
 
 
 BuildRequires: python3-devel
 BuildRequires: python3-devel
@@ -44,7 +44,6 @@ partition tables.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1
 
 
 rm -rf %{py3dir}
 rm -rf %{py3dir}
 mkdir -p %{py3dir}
 mkdir -p %{py3dir}
@@ -91,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitearch}/%{name}-%{version}-*.egg-info
 %{python3_sitearch}/%{name}-%{version}-*.egg-info
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.4-1
+- new upstream release: the latest version with python2 support.
+
 * Mon Sep 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.2-1
 * Mon Sep 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.2-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 18 - 13
p/python-asn1crypto/python-asn1crypto-vl.spec

@@ -6,17 +6,16 @@
 
 
 %{!?python3_pkgversion:%global python3_pkgversion 3}
 %{!?python3_pkgversion:%global python3_pkgversion 3}
 
 
-Name:           python-%{pypi_name}
-Version:        0.24.0
-Release:        6%{?_dist_release}
 Summary:        Fast Python ASN.1 parser and serializer
 Summary:        Fast Python ASN.1 parser and serializer
-
-License:        MIT
-URL:            https://github.com/wbond/asn1crypto
-
+Name:           python-%{pypi_name}
+Version:        1.4.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        MIT
+URL:            https://github.com/wbond/asn1crypto
 Source0:        https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Source0:        https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildArch:      noarch
 
 
@@ -55,7 +54,7 @@ rm -rf %{pypi_name}.egg-info
 
 
 %build
 %build
 %if 0%{?with_python2}
 %if 0%{?with_python2}
-%py_build
+%py2_build
 %endif
 %endif
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_build
 %py3_build
@@ -63,7 +62,7 @@ rm -rf %{pypi_name}.egg-info
 
 
 %install
 %install
 %if 0%{?with_python2}
 %if 0%{?with_python2}
-%py_install
+%py2_install
 %endif
 %endif
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
@@ -79,19 +78,25 @@ rm -rf %{pypi_name}.egg-info
 
 
 %if 0%{?with_python2}
 %if 0%{?with_python2}
 %files
 %files
-%doc
-%{python_sitelib}/%{pypi_name}
-%{python_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%license LICENSE
+%doc readme* changelog*
+%{python2_sitelib}/%{pypi_name}
+%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %endif
 %endif
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{pypi_name}
 %files -n python%{python3_pkgversion}-%{pypi_name}
-%doc
+%license LICENSE
+%doc readme* changelog*
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.4.0-1
+- new upstream release.
+
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.24.0-6
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.24.0-6
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 21 - 16
p/python-babel/python-babel-vl.spec

@@ -1,26 +1,22 @@
 %global srcname Babel
 %global srcname Babel
-%define ver 2.6.0
-%define rel 2
 
 
 Summary: A collection of tools for internationalizing Python applications
 Summary: A collection of tools for internationalizing Python applications
 Name: python-babel
 Name: python-babel
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-
-License: modified BSD-style License
-Group: Development/Libraries
-URL: http://babel.pocoo.org/
-
+Version: 2.8.0
+Release: 1%{?_dist_release}
+Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArch: noarch
-
+License: modified BSD-style License
+URL: https://babel.pocoo.org/
 Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{srcname}-%{version}.tar.gz
 Source0: https://files.pythonhosted.org/packages/source/B/%{srcname}/%{srcname}-%{version}.tar.gz
-Patch0: babel-2.3.4-remove-pytz-version.patch
 
 
-BuildRequires: python-setuptools, python-rpm-macros, python-pytz
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: python-rpm-macros
+BuildRequires: python-setuptools, python2-rpm-macros, python-pytz
 Requires: python-setuptools
 Requires: python-setuptools
 Requires: python-pytz
 Requires: python-pytz
 
 
@@ -34,8 +30,10 @@ Babel is composed of two major parts:
    providing access to various locale display names, localized number 
    providing access to various locale display names, localized number 
    and date formatting, etc. 
    and date formatting, etc. 
 
 
+
 %package -n python3-babel
 %package -n python3-babel
 Summary: A collection of tools for internationalizing Python applications
 Summary: A collection of tools for internationalizing Python applications
+Group: programming
 BuildRequires: python3-setuptools, python3-rpm-macros, python3-pytz
 BuildRequires: python3-setuptools, python3-rpm-macros, python3-pytz
 Requires: python3-setuptools
 Requires: python3-setuptools
 Requires: python3-pytz
 Requires: python3-pytz
@@ -51,17 +49,20 @@ Babel is composed of two major parts:
   providing access to various locale display names, localized number
   providing access to various locale display names, localized number
   and date formatting, etc.
   and date formatting, etc.
 
 
+
 %prep
 %prep
 %autosetup -n %{srcname}-%{version}
 %autosetup -n %{srcname}-%{version}
 
 
+
 %build
 %build
 %py3_build
 %py3_build
-%py_build
+%py2_build
+
 
 
 %install
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %py3_install
 %py3_install
-%py_install
+%py2_install
 
 
 
 
 %clean
 %clean
@@ -82,7 +83,11 @@ Babel is composed of two major parts:
 %{python3_sitelib}/Babel-%{version}-py*.egg-info
 %{python3_sitelib}/Babel-%{version}-py*.egg-info
 %{python3_sitelib}/babel
 %{python3_sitelib}/babel
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.0-1
+- new upstream release.
+
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.0-2
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.0-2
 - fixed R:.
 - fixed R:.
 
 

+ 21 - 9
p/python-cffi/python-cffi-vl.spec

@@ -1,12 +1,13 @@
 Name:           python-cffi
 Name:           python-cffi
-Version:        1.14.0
+Version:        1.14.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Foreign Function Interface for Python to call C code
 Summary:        Foreign Function Interface for Python to call C code
-Group:          Development/Libraries
-License:        MIT
-URL:            https://pypi.org/project/cffi/
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
+
+License:        MIT
+URL:            https://pypi.org/project/cffi/
 Source0:        cffi-%{version}.tar.gz
 Source0:        cffi-%{version}.tar.gz
 
 
 BuildRequires:  libffi-devel
 BuildRequires:  libffi-devel
@@ -16,6 +17,7 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gcc-c++
 
 
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 BuildRequires:  python-pycparser
 BuildRequires:  python-pycparser
@@ -29,13 +31,16 @@ BuildRequires:  python3-pycparser
 
 
 %?python_enable_dependency_generator
 %?python_enable_dependency_generator
 
 
+
 %description
 %description
 Foreign Function Interface for Python, providing a convenient and
 Foreign Function Interface for Python, providing a convenient and
 reliable way of calling existing C code from Python. The interface is
 reliable way of calling existing C code from Python. The interface is
 based on LuaJIT’s FFI.
 based on LuaJIT’s FFI.
 
 
+
 %package -n python3-cffi
 %package -n python3-cffi
 Summary:        Foreign Function Interface for Python 3 to call C code
 Summary:        Foreign Function Interface for Python 3 to call C code
+Group:          programming
 %{?python_provide:%python_provide python3-cffi}
 %{?python_provide:%python_provide python3-cffi}
 
 
 %description -n python3-cffi
 %description -n python3-cffi
@@ -43,23 +48,27 @@ Foreign Function Interface for Python, providing a convenient and
 reliable way of calling existing C code from Python. The interface is
 reliable way of calling existing C code from Python. The interface is
 based on LuaJIT’s FFI.
 based on LuaJIT’s FFI.
 
 
+
 %prep
 %prep
 %autosetup -n cffi-%{version}
 %autosetup -n cffi-%{version}
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
+
 %files
 %files
 %doc PKG-INFO
 %doc PKG-INFO
 %license LICENSE
 %license LICENSE
-%{python_sitearch}/cffi/
-%{python_sitearch}/_cffi_backend.so
-%{python_sitearch}/cffi-%{version}-py%{python_version}.egg-info/
+%{python2_sitearch}/cffi/
+%{python2_sitearch}/_cffi_backend.so
+%{python2_sitearch}/cffi-%{version}-py%{python_version}.egg-info/
 
 
 %files -n python3-cffi
 %files -n python3-cffi
 %doc PKG-INFO
 %doc PKG-INFO
@@ -69,6 +78,9 @@ based on LuaJIT’s FFI.
 %{python3_sitearch}/cffi-%{version}-py%{python3_version}.egg-info/
 %{python3_sitearch}/cffi-%{version}-py%{python3_version}.egg-info/
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.14.1-1
+- new upstream release.
+
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.14.0-1
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.14.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 20 - 22
p/python-chardet/python-chardet-vl.spec

@@ -2,60 +2,54 @@
 
 
 Name:           python-chardet
 Name:           python-chardet
 Version:        3.0.4
 Version:        3.0.4
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Character encoding auto-detection in Python
 Summary:        Character encoding auto-detection in Python
 Summary(ja):    Python で文字エンコーディングを自動検出
 Summary(ja):    Python で文字エンコーディングを自動検出
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Languages
 License:        LGPLv2
 License:        LGPLv2
 URL:            https://pypi.python.org/pypi/chardet
 URL:            https://pypi.python.org/pypi/chardet
 Source0:        https://pypi.python.org/packages/source/c/chardet/chardet-%{version}.tar.gz
 Source0:        https://pypi.python.org/packages/source/c/chardet/chardet-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
 BuildArch:      noarch
 BuildArch:      noarch
-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-devel, python3-setuptools, python3-rpm-macros
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 Character encoding auto-detection in Python. As 
 Character encoding auto-detection in Python. As 
 smart as your browser. Open source.
 smart as your browser. Open source.
 
 
+
 %package -n python3-%{pypi_name}
 %package -n python3-%{pypi_name}
 Summary:        Character encoding auto-detection in Python 3
 Summary:        Character encoding auto-detection in Python 3
 Summary(ja):    Python で文字エンコーディングを自動検出
 Summary(ja):    Python で文字エンコーディングを自動検出
+Group:          programming
 
 
 %description -n python3-%{pypi_name}
 %description -n python3-%{pypi_name}
 Character encoding auto-detection in Python. As
 Character encoding auto-detection in Python. As
 smart as your browser. Open source.
 smart as your browser. Open source.
 
 
+
 %prep
 %prep
 %setup -q -n chardet-%{version}
 %setup -q -n chardet-%{version}
-
 sed -ie '1d' %{pypi_name}/cli/chardetect.py
 sed -ie '1d' %{pypi_name}/cli/chardetect.py
 
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
 
 
 %build
 %build
-# Remove CFLAGS=... for noarch packages (unneeded)
-%{__python} setup.py build
+%py2_build
+%py3_build
 
 
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-# Do Python 3 first not to overwrite the entrypoint
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT%{_bindir}/{,python3-}chardetect
-popd
+%py2_install
+mv $RPM_BUILD_ROOT%{_bindir}/{,python2-}chardetect
+%py3_install
 
 
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
  
  
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -67,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %license LICENSE
 %license LICENSE
 %doc README.rst
 %doc README.rst
 # For noarch packages: sitelib
 # For noarch packages: sitelib
-%{_bindir}/chardetect
+%{_bindir}/python2-chardetect
 %{python_sitelib}/*
 %{python_sitelib}/*
 
 
 %files -n python3-%{pypi_name}
 %files -n python3-%{pypi_name}
@@ -75,9 +69,13 @@ rm -rf $RPM_BUILD_ROOT
 %license LICENSE
 %license LICENSE
 %doc README.rst
 %doc README.rst
 %{python3_sitelib}/*
 %{python3_sitelib}/*
-%{_bindir}/python3-chardetect
+%{_bindir}/chardetect
+
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-2
+- rebuilt with python-3.8.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-1
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 13 - 13
p/python-cryptography/python-cryptography-vl.spec

@@ -1,23 +1,18 @@
 %global with_python3 1
 %global with_python3 1
-%{!?__python2: %global __python2 /usr/bin/python}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 
 %{!?python3_pkgversion:%global python3_pkgversion 3}
 %{!?python3_pkgversion:%global python3_pkgversion 3}
-
 %global srcname cryptography
 %global srcname cryptography
 
 
+Summary:        PyCA's cryptography library
 Name:           python-%{srcname}
 Name:           python-%{srcname}
-Version:        2.4.1
+Version:        3.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        PyCA's cryptography library
-
-Group:          Development/Libraries
-License:        ASL 2.0 or BSD
-URL:            https://cryptography.io/en/latest/
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        ASL 2.0 or BSD
+URL:            https://cryptography.io/en/latest/
 Source0:        https://pypi.io/packages/source/c/%{srcname}/%{srcname}-%{version}.tar.gz
 Source0:        https://pypi.io/packages/source/c/%{srcname}/%{srcname}-%{version}.tar.gz
 
 
 Requires:       openssl
 Requires:       openssl
@@ -32,6 +27,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  gcc
 BuildRequires:  gcc
 
 
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 BuildRequires:  python-asn1crypto >= 0.21
 BuildRequires:  python-asn1crypto >= 0.21
@@ -65,7 +61,7 @@ Provides:       python-%{srcname}
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n  python%{python3_pkgversion}-%{srcname}
 %package -n  python%{python3_pkgversion}-%{srcname}
-Group:          Development/Libraries
+Group:          programming
 Summary:        PyCA's cryptography library
 Summary:        PyCA's cryptography library
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
 
@@ -129,21 +125,25 @@ popd
 
 
 
 
 %files
 %files
-%doc LICENSE LICENSE.APACHE LICENSE.BSD README.rst docs
+%license LICENSE*
+%doc README.rst docs
 %{python2_sitearch}/%{srcname}
 %{python2_sitearch}/%{srcname}
 %{python2_sitearch}/%{srcname}-%{version}-py*.egg-info
 %{python2_sitearch}/%{srcname}-%{version}-py*.egg-info
 
 
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname}
 %files -n python%{python3_pkgversion}-%{srcname}
+%license LICENSE*
 %doc README.rst docs
 %doc README.rst docs
-%license LICENSE LICENSE.APACHE LICENSE.BSD
 %{python3_sitearch}/*
 %{python3_sitearch}/*
 %{python3_sitearch}/%{srcname}-%{version}-py*.egg-info
 %{python3_sitearch}/%{srcname}-%{version}-py*.egg-info
 %endif
 %endif
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0-1
+- new upstream release.
+
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.1-1
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.4.1-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 39 - 44
p/python-cups/python-cups-vl.spec

@@ -3,36 +3,31 @@
 %filter_setup
 %filter_setup
 }
 }
 
 
-%define py3dir  %{_builddir}/python3-%{name}-%{version}-%{release}
-%define __python3 /usr/bin/python3
-%define python3_sitearch  %(%{__python3} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")
-%define python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(0))")
-
-Summary:       Python bindings for CUPS
-Name:          python-cups
-Version:       1.9.74
-Release:       1%{?_dist_release}
-URL:           http://cyberelk.net/tim/software/pycups/
-Source:        http://cyberelk.net/tim/data/pycups/pycups-%{version}.tar.bz2
-License:       GPLv2+
-Group:         Development/Languages
-BuildRequires: cups-devel
-BuildRequires: python-devel
-BuildRequires: python3-devel
-BuildRequires: epydoc
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+Summary:        Python bindings for CUPS
+Name:           python-cups
+Version:        2.0.1
+Release:        1%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2+
+URL:            https://github.com/OpenPrinting/pycups
+Source:         https://github.com/OpenPrinting/pycups/releases/download/v%{version}/pycups-%{version}.tar.gz
+
+BuildRequires:  cups-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-devel
 
 
 %description
 %description
 This package provides Python bindings for CUPS API,
 This package provides Python bindings for CUPS API,
 known as pycups. It was written for use with
 known as pycups. It was written for use with
 system-config-printer, but can be put to other uses as well.
 system-config-printer, but can be put to other uses as well.
 
 
+
 %package -n python3-cups
 %package -n python3-cups
-Summary:       Python3 bindings for CUPS API, known as pycups.
-Group:         Development/Languages
+Summary:        Python3 bindings for CUPS API, known as pycups.
+Group:          programming
 
 
 %description -n python3-cups
 %description -n python3-cups
 This package provides Python bindings for CUPS API,
 This package provides Python bindings for CUPS API,
@@ -43,7 +38,8 @@ This is a ported release for python 3
 
 
 %package doc
 %package doc
 Summary:       Documentation for python-cups
 Summary:       Documentation for python-cups
-Group:         Documentation
+Group:         documentation
+BuildArch:     noarch
 
 
 %description doc
 %description doc
 Documentation for python-cups.
 Documentation for python-cups.
@@ -51,33 +47,25 @@ Documentation for python-cups.
 %prep
 %prep
 %setup -q -n pycups-%{version}
 %setup -q -n pycups-%{version}
 
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
+sed -i '/^#!\/usr\/bin\/python/d' examples/cupstree.py
 
 
-%build
-make CFLAGS="%{optflags} -fno-strict-aliasing"
-make doc
 
 
-pushd %{py3dir}
-CFLAGS="%{optflags}" %{__python3} setup.py build
-popd
+%build
+%py3_build
 
 
 
 
 %install
 %install
-make install DESTDIR="%{buildroot}"
+make install-rpmhook DESTDIR="%{buildroot}"
+%py3_install
 
 
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
-chmod 755 %{buildroot}%{python3_sitearch}/cups*.so
-popd
+%ifarch x86_64
+export PYTHONPATH=%{buildroot}%{python3_sitearch}
+%{__python3} -m pydoc -w cups
+rm -rf html
+mkdir html
+mv cups.html html
+%endif
 
 
-%files
-%license COPYING
-%doc README NEWS TODO
-%{python_sitearch}/cups.so
-%{python_sitearch}/pycups*.egg-info
-%{_rpmconfigdir}/fileattrs/psdriver.attr
-%{_rpmconfigdir}/postscriptdriver.prov
 
 
 %files -n python3-cups
 %files -n python3-cups
 %license COPYING
 %license COPYING
@@ -87,10 +75,17 @@ popd
 %{_rpmconfigdir}/fileattrs/psdriver.attr
 %{_rpmconfigdir}/fileattrs/psdriver.attr
 %{_rpmconfigdir}/postscriptdriver.prov
 %{_rpmconfigdir}/postscriptdriver.prov
 
 
+%ifarch x86_64
 %files doc
 %files doc
 %doc examples html
 %doc examples html
+%endif
+
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.1-1
+- new upstream release.
+- built with python3 only.
+
 * Wed Apr 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.74-1
 * Wed Apr 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.74-1
 - new upstream release.
 - new upstream release.
 
 

+ 24 - 13
p/python-dateutil/python-dateutil-vl.spec

@@ -1,69 +1,80 @@
+Summary:        Powerful extensions to the standard datetime module
 Name:           python-dateutil
 Name:           python-dateutil
-Version:        2.8.0
+Version:        2.8.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        Powerful extensions to the standard datetime module
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Languages
 License:        Python
 License:        Python
-URL:            http://labix.org/python-dateutil
-Source0:        http://labix.org/download/python-dateutil/python-dateutil-%{version}.tar.gz
+URL:            https://labix.org/python-dateutil
+Source0:        https://github.com/dateutil/dateutil/releases/download/%{version}/python-dateutil-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildArch:      noarch
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 The dateutil module provides powerful extensions to the standard datetime
 The dateutil module provides powerful extensions to the standard datetime
 module available in Python 2.3+.
 module available in Python 2.3+.
 
 
+
 %package -n python3-dateutil
 %package -n python3-dateutil
 Summary:        Powerful extensions to the standard datetime module
 Summary:        Powerful extensions to the standard datetime module
+Group:          programming
 
 
 %description -n python3-dateutil
 %description -n python3-dateutil
 The dateutil module provides powerful extensions to the standard datetime
 The dateutil module provides powerful extensions to the standard datetime
 module available in Python 3.0+.
 module available in Python 3.0+.
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
-
 # Reencode this as utf8
 # Reencode this as utf8
 iconv -f ISO-8859-1 -t utf8 NEWS
 iconv -f ISO-8859-1 -t utf8 NEWS
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
 
 
 %install
 %install
 %__rm -rf $RPM_BUILD_ROOT
 %__rm -rf $RPM_BUILD_ROOT
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
+
 %clean
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 %__rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc LICENSE NEWS README*
+%license LICENSE
+%doc NEWS README*
 %{python_sitelib}/dateutil/
 %{python_sitelib}/dateutil/
 %{python_sitelib}/*.egg-info
 %{python_sitelib}/*.egg-info
 
 
 %files -n python3-dateutil
 %files -n python3-dateutil
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc LICENSE NEWS README*
+%license LICENSE
+%doc NEWS README*
 %{python3_sitelib}/dateutil/
 %{python3_sitelib}/dateutil/
 %{python3_sitelib}/*.egg-info
 %{python3_sitelib}/*.egg-info
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.1-1
+- new upstream release.
+
 * Thu Feb 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.0-1
 * Thu Feb 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 20 - 23
p/python-dns/python-dns-vl.spec

@@ -1,28 +1,22 @@
 Name:           python-dns
 Name:           python-dns
-Version:        1.16.0
+Version:        2.0.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        DNS toolkit for Python
 Summary:        DNS toolkit for Python
 Summary(ja):    Python 用 DNS ツールキット
 Summary(ja):    Python 用 DNS ツールキット
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Languages
 License:        MIT
 License:        MIT
 URL:            http://www.dnspython.org/
 URL:            http://www.dnspython.org/
-Source0:        http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz
-Source1:        http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0:        https://github.com/rthalley/dnspython/archive/v%{version}.tar.gz#/dnspython-%{version}.tar.gz
 
 
 BuildArch:      noarch
 BuildArch:      noarch
-BuildRequires: python-setuptools
-BuildRequires: python-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
+BuildRequires: python3-rpm-macros
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-devel
 BuildRequires: python3-devel
-BuildRequires: python3-rpm-macros
-
-BuildRequires:  python-crypto
-
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 %description
 %description
 dnspython is a DNS toolkit for Python. It supports almost all record
 dnspython is a DNS toolkit for Python. It supports almost all record
@@ -36,8 +30,10 @@ manipulation of DNS zones, messages, names, and records.
 
 
 %package -n python3-dns
 %package -n python3-dns
 Summary:        DNS toolkit for Python 3
 Summary:        DNS toolkit for Python 3
+Group:          programming
 %{?python_provide:%python_provide python3-dns}
 %{?python_provide:%python_provide python3-dns}
-Requires:       python3-crypto
+Requires:       python3-idna
+Requires:       python3-cryptography
 
 
 %description -n python3-dns
 %description -n python3-dns
 dnspython3 is a DNS toolkit for Python 3. It supports almost all
 dnspython3 is a DNS toolkit for Python 3. It supports almost all
@@ -49,6 +45,7 @@ level classes perform queries for data of a given name, type, and
 class, and return an answer set. The low level classes allow direct
 class, and return an answer set. The low level classes allow direct
 manipulation of DNS zones, messages, names, and records.
 manipulation of DNS zones, messages, names, and records.
 
 
+
 %prep
 %prep
 %setup0 -q -n dnspython-%{version}
 %setup0 -q -n dnspython-%{version}
 
 
@@ -56,28 +53,23 @@ manipulation of DNS zones, messages, names, and records.
 # from documentation
 # from documentation
 find examples -type f | xargs chmod a-x
 find examples -type f | xargs chmod a-x
 
 
+
 %build
 %build
-%py_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
-%py_install
 %py3_install
 %py3_install
 
 
+
 #%check
 #%check
-#%{__python} setup.py test
 #%{__python3} setup.py test
 #%{__python3} setup.py test
 
 
+
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%license LICENSE
-%doc README* examples
-%{python_sitelib}/*egg-info
-%{python_sitelib}/dns
 
 
 %files -n python3-dns
 %files -n python3-dns
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -86,7 +78,12 @@ rm -rf %{buildroot}
 %{python3_sitelib}/*egg-info
 %{python3_sitelib}/*egg-info
 %{python3_sitelib}/dns
 %{python3_sitelib}/dns
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.0-1
+- new upstream release.
+- built with python3 only.
+
 * Tue May 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-1
 * Tue May 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 34 - 51
p/python-docutils/python-docutils-vl.spec

@@ -5,28 +5,31 @@
 Summary: an open-source text processing system written in Python
 Summary: an open-source text processing system written in Python
 Summary(ja): Pythonで書かれたテキスト処理システム
 Summary(ja): Pythonで書かれたテキスト処理システム
 Name: python-%{srcname}
 Name: python-%{srcname}
-Version: 0.14
+Version: 0.16
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Development/Languages
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: shaolin, munepi, owa
+
 License: Public Domain and MIT and Python and GPLv3+
 License: Public Domain and MIT and Python and GPLv3+
-URL: http://docutils.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
+URL: https://docutils.sourceforge.net/
+Source0: https://prdownloads.sourceforge.net/%{srcname}/%{srcname}-%{version}.tar.gz
 ## for rst-mode
 ## for rst-mode
 Source1: %{elisppkgname}-install.sh
 Source1: %{elisppkgname}-install.sh
 Source2: %{elisppkgname}-remove.sh
 Source2: %{elisppkgname}-remove.sh
 Source3: vine-default-%{elisppkgname}.el
 Source3: vine-default-%{elisppkgname}.el
 Source4: %{elisppkgname}-init.el
 Source4: %{elisppkgname}-init.el
 
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildArch: noarch
-BuildRequires: python-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
+BuildRequires: python-devel
+BuildRequires: python2-rpm-macros
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
 Requires: python
 Requires: python
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: shaolin, munepi, owa
 %{?python_provide:%python_provide python2-%{srcname}}
 %{?python_provide:%python_provide python2-%{srcname}}
 Provides: docutils = %{version}-%{release}
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils <= 0.5
 Obsoletes: docutils <= 0.5
@@ -43,10 +46,11 @@ Docutilsはオープンソースのテキスト処理システムで、プレー
 読みやすく使いやすくWYSIWYGなプレーンテキストのマークアップ言語である
 読みやすく使いやすくWYSIWYGなプレーンテキストのマークアップ言語である
 reStructuresTextを含んでいます。
 reStructuresTextを含んでいます。
 
 
+
 %package -n python3-%{srcname}
 %package -n python3-%{srcname}
 Summary: an open-source text processing system written in Python
 Summary: an open-source text processing system written in Python
 Summary(ja): Pythonで書かれたテキスト処理システム
 Summary(ja): Pythonで書かれたテキスト処理システム
-Group: Development/Languages
+Group: programming
 
 
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -70,7 +74,7 @@ reStructuresTextを含んでいます。
 %package -n %{elisppkgname}
 %package -n %{elisppkgname}
 Summary: Emacs support for reStructuredText
 Summary: Emacs support for reStructuredText
 Summary(ja): reStructuredText の Emacs サポート
 Summary(ja): reStructuredText の Emacs サポート
-Group: Applications/Editors/Emacs
+Group: publishing
 Requires:     emacsen
 Requires:     emacsen
 Requires(post,preun):       emacsen
 Requires(post,preun):       emacsen
 %prereq_ge    emacsen-common
 %prereq_ge    emacsen-common
@@ -81,53 +85,43 @@ Emacs support for reStructuredText.
 %description -l ja -n %{elisppkgname}
 %description -l ja -n %{elisppkgname}
 reStructuredText の Emacs サポート
 reStructuredText の Emacs サポート
 
 
+
 %prep
 %prep
 %setup -q -n %{srcname}-%{version}
 %setup -q -n %{srcname}-%{version}
 
 
 # Remove shebang from library files
 # Remove shebang from library files
-for file in docutils/utils/{code_analyzer.py,punctuation_chars.py,error_reporting.py,smartquotes.py} docutils/utils/math/{latex2mathml.py,math2html.py} docutils/writers/xetex/__init__.py; do
-sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $file
-done
+sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $(grep -Erl '^#!.+python' %{srcname})
 
 
 iconv -f ISO88592 -t UTF8 tools/editors/emacs/IDEAS.rst > tmp
 iconv -f ISO88592 -t UTF8 tools/editors/emacs/IDEAS.rst > tmp
 mv tmp tools/editors/emacs/IDEAS.rst
 mv tmp tools/editors/emacs/IDEAS.rst
 
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
+# We want the licenses but don't need this build file
+rm -f licenses/docutils.conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1687377
+rm test/test_writers/test_odt.py
+
 
 
 %build
 %build
-pushd %{py3dir}
 %py3_build
 %py3_build
-popd
-%py_build
+%py2_build
 
 
 %install
 %install
 %__rm -rf $RPM_BUILD_ROOT
 %__rm -rf $RPM_BUILD_ROOT
 
 
-pushd %{py3dir}
+%py2_install
 %py3_install
 %py3_install
-# We want the licenses but don't need this build file
-rm -f licenses/docutils.conf
 
 
 # Flash file is used for testing docutils but shouldn't be in the installed package.
 # Flash file is used for testing docutils but shouldn't be in the installed package.
 mv docs/user/rst/images/biohazard.swf ./biohazard.swf 
 mv docs/user/rst/images/biohazard.swf ./biohazard.swf 
-popd
-
-rm -f %{buildroot}/%{_bindir}/*
-
-%py_install
 
 
 # docutils setup.py runs 2to3 on a copy of the tests and puts it in sitelib.
 # docutils setup.py runs 2to3 on a copy of the tests and puts it in sitelib.
 rm -rf %{buildroot}%{python3_sitelib}/test
 rm -rf %{buildroot}%{python3_sitelib}/test
 
 
-# Flash file is used for testing docutils but shouldn't be in the installed package.
-mv docs/user/rst/images/biohazard.swf ./biohazard.swf 
-
 for file in %{buildroot}/%{_bindir}/*.py; do
 for file in %{buildroot}/%{_bindir}/*.py; do
-    mv $file `dirname $file`/`basename $file .py`
+  mv $file `dirname $file`/`basename $file .py`
 done
 done
 
 
-
 ## for Emacs package
 ## for Emacs package
 mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/%{elisppkgname}/packages
 mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/%{elisppkgname}/packages
 mkdir -p %{buildroot}%{emacsen_pkgdir}/install
 mkdir -p %{buildroot}%{emacsen_pkgdir}/install
@@ -143,22 +137,15 @@ cp -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/emacs/site-lisp/%{elisppkgna
 # install script (bytecompile el and install elc , remove)
 # install script (bytecompile el and install elc , remove)
 #
 #
 %_installemacsenscript %{elisppkgname} %{SOURCE1}
 %_installemacsenscript %{elisppkgname} %{SOURCE1}
-
 %_removeemacsenscript  %{elisppkgname} %{SOURCE2}
 %_removeemacsenscript  %{elisppkgname} %{SOURCE2}
 
 
 
 
-
 %check
 %check
 mv  biohazard.swf docs/user/rst/images/biohazard.swf
 mv  biohazard.swf docs/user/rst/images/biohazard.swf
 python test/alltests.py
 python test/alltests.py
+python3 test/alltests.py
 rm docs/user/rst/images/biohazard.swf
 rm docs/user/rst/images/biohazard.swf
 
 
-pushd %{py3dir}
-mv  biohazard.swf docs/user/rst/images/biohazard.swf
-python3 test3/alltests.py
-rm docs/user/rst/images/biohazard.swf
-popd
-
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
@@ -169,23 +156,15 @@ rm -rf $RPM_BUILD_ROOT
 # bytecompile and install
 # bytecompile and install
 #
 #
 if [ "$1" = 2 ]; then
 if [ "$1" = 2 ]; then
-
 %_emacsenPackageRemove %{elisppkgname}
 %_emacsenPackageRemove %{elisppkgname}
-
 fi
 fi
-
 %_addemacsenlist %{elisppkgname}
 %_addemacsenlist %{elisppkgname}
-
 %_emacsenPackageInstall %{elisppkgname}
 %_emacsenPackageInstall %{elisppkgname}
 
 
-
 %preun -n %{elisppkgname}
 %preun -n %{elisppkgname}
 if [ "$1" = 0 ]; then
 if [ "$1" = 0 ]; then
-
 %_emacsenPackageRemove %{elisppkgname}
 %_emacsenPackageRemove %{elisppkgname}
-
 %_removeemacsenlist %{elisppkgname}
 %_removeemacsenlist %{elisppkgname}
-
 fi
 fi
 
 
 
 
@@ -195,7 +174,6 @@ fi
 %license COPYING.txt licenses/*
 %license COPYING.txt licenses/*
 %doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
 %doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
 %doc THANKS.txt docs tools/editors
 %doc THANKS.txt docs tools/editors
-%{_bindir}/*
 %{python_sitelib}/%{srcname}/
 %{python_sitelib}/%{srcname}/
 %{python_sitelib}/docutils-*.egg-info
 %{python_sitelib}/docutils-*.egg-info
 
 
@@ -204,19 +182,24 @@ fi
 %license COPYING.txt licenses/*
 %license COPYING.txt licenses/*
 %doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
 %doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
 %doc THANKS.txt docs tools/editors
 %doc THANKS.txt docs tools/editors
+%{_bindir}/*
 %{python3_sitelib}/%{srcname}/
 %{python3_sitelib}/%{srcname}/
 %{python3_sitelib}/docutils-*.egg-info
 %{python3_sitelib}/docutils-*.egg-info
 
 
 %files -n %{elisppkgname}
 %files -n %{elisppkgname}
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc BUGS.txt HISTORY.txt RELEASE-NOTES.txt COPYING.txt THANKS.txt FAQ.txt README.txt
-%doc licenses tools/editors
+%license COPYING.txt licenses/*
+%doc BUGS.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt docs tools/editors
 %{_datadir}/emacs/site-lisp/%{elisppkgname}
 %{_datadir}/emacs/site-lisp/%{elisppkgname}
 %{emacsen_pkgdir}/install/%{elisppkgname}
 %{emacsen_pkgdir}/install/%{elisppkgname}
 %{emacsen_pkgdir}/remove/%{elisppkgname}
 %{emacsen_pkgdir}/remove/%{elisppkgname}
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.16-1
+- new upstream release.
+
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.14-1
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.14-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 17 - 10
p/python-funcparserlib/python-funcparserlib-vl.spec

@@ -1,23 +1,23 @@
 Summary: Recursive descent parsing library for Python based on functional combinators
 Summary: Recursive descent parsing library for Python based on functional combinators
 Name: python-funcparserlib
 Name: python-funcparserlib
 Version: 0.3.6
 Version: 0.3.6
-Release: 1%{?_dist_release}
-Group: Development/Libraries
-
+Release: 2%{?_dist_release}
+Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 License: MIT License
 License: MIT License
 URL: https://pypi.org/project/funcparserlib/
 URL: https://pypi.org/project/funcparserlib/
 Source0:https://pypi.python.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
 Source0:https://pypi.python.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel
 BuildRequires: python-devel
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 Requires: python
 Requires: python
 
 
-
 %description
 %description
 Parser combinators are just higher-order functions that take parsers as 
 Parser combinators are just higher-order functions that take parsers as 
 their arguments and return them as result values. Parser combinators are:
 their arguments and return them as result values. Parser combinators are:
@@ -38,6 +38,7 @@ external DSLs (domain specific languages).
 
 
 %package -n python3-funcparserlib
 %package -n python3-funcparserlib
 Summary: Recursive descent parsing library for Python based on functional combinators
 Summary: Recursive descent parsing library for Python based on functional combinators
+Group: programming
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -64,22 +65,26 @@ external DSLs (domain specific languages).
 %prep
 %prep
 %setup -q -n funcparserlib-%{version}
 %setup -q -n funcparserlib-%{version}
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
 sed -i \
 sed -i \
 	-e 's/except NoParseError, e:/except NoParseError as e:/' \
 	-e 's/except NoParseError, e:/except NoParseError as e:/' \
 	%{buildroot}%{python3_sitelib}/funcparserlib/parser.py
 	%{buildroot}%{python3_sitelib}/funcparserlib/parser.py
 
 
+
 %clean
 %clean
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE
 %license LICENSE
@@ -93,7 +98,11 @@ sed -i \
 %doc CHANGES README doc examples
 %doc CHANGES README doc examples
 %{python3_sitelib}/funcparserlib*
 %{python3_sitelib}/funcparserlib*
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.6-2
+- rebuilt with python-3.8.
+
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.6-1
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.6-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.
@@ -106,5 +115,3 @@ sed -i \
 
 
 * Mon May 16 2011 IWAI, Masaharu <iwai@alib.jp> 0.3.5-1
 * Mon May 16 2011 IWAI, Masaharu <iwai@alib.jp> 0.3.5-1
 - Initial build.
 - Initial build.
-
-

+ 16 - 8
p/python-idna/python-idna-vl.spec

@@ -2,19 +2,18 @@
 %global srcname idna
 %global srcname idna
 
 
 Name:           python-%{srcname}
 Name:           python-%{srcname}
-Version:        2.7
-Release:        4%{?_dist_release}
+Version:        2.10
+Release:        1%{?_dist_release}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 Summary:        Internationalized Domain Names in Applications (IDNA)
-
-License:        BSD and Python and Unicode
-URL:            https://github.com/kjd/idna
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        BSD and Python and Unicode
+URL:            https://github.com/kjd/idna
 Source0:        https://pypi.io/packages/source/i/%{srcname}/%{srcname}-%{version}.tar.gz
 Source0:        https://pypi.io/packages/source/i/%{srcname}/%{srcname}-%{version}.tar.gz
-BuildArch:      noarch
 
 
+BuildArch:      noarch
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
@@ -36,9 +35,11 @@ The library is also intended to act as a suitable drop-in replacement for the
 "encodings.idna" module that comes with the Python standard library but
 "encodings.idna" module that comes with the Python standard library but
 currently only supports the older 2003 specification.
 currently only supports the older 2003 specification.
 
 
+
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 Summary:        Internationalized Domain Names in Applications (IDNA)
+Group:          programming
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
 
 %description -n python%{python3_pkgversion}-%{srcname}
 %description -n python%{python3_pkgversion}-%{srcname}
@@ -52,11 +53,13 @@ The library is also intended to act as a suitable drop-in replacement for the
 currently only supports the older 2003 specification.
 currently only supports the older 2003 specification.
 %endif # with_python3
 %endif # with_python3
 
 
+
 %prep
 %prep
 %setup -q -n %{srcname}-%{version}
 %setup -q -n %{srcname}-%{version}
 # Remove bundled egg-info
 # Remove bundled egg-info
 rm -rf %{srcname}.egg-info
 rm -rf %{srcname}.egg-info
 
 
+
 %build
 %build
 %py_build
 %py_build
 
 
@@ -64,6 +67,7 @@ rm -rf %{srcname}.egg-info
 %py3_build
 %py3_build
 %endif # with_python3
 %endif # with_python3
 
 
+
 %install
 %install
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
@@ -71,9 +75,9 @@ rm -rf %{srcname}.egg-info
 
 
 %py_install
 %py_install
 
 
+
 %check
 %check
 #{__python2} setup.py test
 #{__python2} setup.py test
-
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 #{__python3} setup.py test
 #{__python3} setup.py test
 %endif # with_python3
 %endif # with_python3
@@ -93,7 +97,11 @@ rm -rf %{srcname}.egg-info
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
 %endif # with_python3
 %endif # with_python3
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.10-1
+- new upstream release.
+
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.7-4
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.7-4
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 23 - 11
p/python-imagesize/python-imagesize-vl.spec

@@ -1,24 +1,25 @@
-
 %global pypi_name imagesize
 %global pypi_name imagesize
 %global sum  Python module for analyzing image file headers and returning image sizes
 %global sum  Python module for analyzing image file headers and returning image sizes
 
 
+Summary:        %{sum}
 Name:           python-%{pypi_name}
 Name:           python-%{pypi_name}
-Version:        1.1.0
+Version:        1.2.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        %{sum}
-
-License:        MIT
-URL:            https://github.com/shibukawa/imagesize_py
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        MIT
+URL:            https://github.com/shibukawa/imagesize_py
 Source0:        https://files.pythonhosted.org/packages/source/i/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Source0:        https://files.pythonhosted.org/packages/source/i/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+
 BuildArch:      noarch
 BuildArch:      noarch
 
 
+BuildRequires:  python-rpm-macros
+
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 BuildRequires:  python-devel
 BuildRequires:  python-devel
-BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 
 
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
@@ -36,8 +37,10 @@ The imagesize package parses image file headers and returns the image sizes.
 
 
 This is a pure Python library.
 This is a pure Python library.
 
 
+
 %package -n     python3-%{pypi_name}
 %package -n     python3-%{pypi_name}
 Summary:        %{sum}
 Summary:        %{sum}
+Group:          programming
 %{?python_provide:%python_provide python3-%{pypi_name}}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
 
 %description -n python3-%{pypi_name}
 %description -n python3-%{pypi_name}
@@ -50,34 +53,43 @@ The imagesize package parses image file headers and returns the image sizes.
 
 
 This is a pure Python library.
 This is a pure Python library.
 
 
+
 %prep
 %prep
 %autosetup -n %{pypi_name}-%{version}
 %autosetup -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 rm -rf %{pypi_name}.egg-info
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 %py3_install
 %py3_install
-%py_install
+%py2_install
+
 
 
 %check
 %check
 #py.test-2
 #py.test-2
 #py.test-3
 #py.test-3
 
 
+
 %files
 %files
 %doc README.rst
 %doc README.rst
 %license LICENSE.rst
 %license LICENSE.rst
-%{python_sitelib}/*
+%{python2_sitelib}/*
 
 
 %files -n python3-%{pypi_name}
 %files -n python3-%{pypi_name}
 %doc README.rst
 %doc README.rst
 %license LICENSE.rst
 %license LICENSE.rst
 %{python3_sitelib}/*
 %{python3_sitelib}/*
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.0-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 212 - 0
p/python-inotify/python-inotify-vl.spec

@@ -0,0 +1,212 @@
+%global with_python3 1
+%global oname  pyinotify
+
+Summary:       Monitor filesystem events with Python under Linux
+Name:          python-inotify
+Version:       0.9.6
+Release:       2%{?_dist_release}
+Group:         programming
+Vendor:        Project Vine
+Distribution:  Vine Linux
+
+License:       MIT
+URL:           https://github.com/seb-m/pyinotify
+Source0:       https://github.com/seb-m/pyinotify/archive/0.9.6.tar.gz#/pyinotify-%{version}.tar.gz
+Source1:       %{oname}
+Patch01:       pyinotify-0.9.6-epoint.patch
+
+BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python-rpm-macros
+BuildRequires: python-devel python-setuptools python2-rpm-macros
+%if 0%{?with_python3}
+BuildRequires: python3-devel python3-setuptools python3-rpm-macros
+%endif
+
+%description
+This is a Python module for watching filesystems changes. pyinotify
+can be used for various kind of fs monitoring. pyinotify relies on a
+recent Linux Kernel feature (merged in kernel 2.6.13) called
+inotify. inotify is an event-driven notifier, its notifications are
+exported from kernel space to user space.
+
+
+%package       examples
+Summary:       Examples for Python inotify module
+Group:         programming
+Requires:      python-inotify = %{version}-%{release}
+
+%description   examples
+This package includes some examples usage of the Python inotify module.
+
+
+%if 0%{?with_python3}
+%package -n    python3-inotify
+Summary:       Monitor filesystem events with Python under Linux
+Group:         programming
+
+%description -n python3-inotify
+This is a Python 3 module for watching filesystems changes. pyinotify
+can be used for various kind of fs monitoring. pyinotify relies on a
+recent Linux Kernel feature (merged in kernel 2.6.13) called
+inotify. inotify is an event-driven notifier, its notifications are
+exported from kernel space to user space.
+
+This is the Python 3 build of pyinotify
+%endif # if with_python3
+
+
+%prep
+%setup -q -n %{oname}-%{version}
+%patch01 -p1
+sed -i '1c#! %{__python3}' python3/pyinotify.py
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+
+
+%build
+%py2_build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%py3_build
+popd
+%endif
+
+
+%install
+%{__rm} -rf %{buildroot}
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%py3_install
+popd
+%{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/python3-%{oname}
+%{__sed} -i -e 's/^python /python3 /' %{buildroot}%{_bindir}/python3-%{oname}
+ln -sf python3-%{oname} %{buildroot}%{_bindir}/%{oname}
+%{__chmod} 0755 %{buildroot}%{python3_sitelib}/%{oname}.py
+%endif
+
+%py2_install
+%{__install} -D -m 0755 -p %{SOURCE1} %{buildroot}%{_bindir}/python2-%{oname}
+%{__chmod} 0755 %{buildroot}%{python_sitelib}/%{oname}.py
+
+# examples
+%{__install} -d -m 0755 %{buildroot}%{_datadir}/%{oname}
+%{__cp} -a python2/examples/* %{buildroot}%{_datadir}/%{oname}
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%files
+%defattr(-, root, root, -)
+%license COPYING
+%doc ACKS README.md
+%{_bindir}/python2-%{oname}
+%{python_sitelib}/%{oname}*
+
+%files examples
+%defattr(-, root, root, -)
+%{_datadir}/%{oname}
+
+%if 0%{?with_python3}
+%files -n python3-inotify
+%defattr(-, root, root, -)
+%license COPYING
+%doc ACKS README.md
+%{_bindir}/%{oname}
+%{_bindir}/python3-%{oname}
+%{python3_sitelib}/%{oname}*
+%{python3_sitelib}/__pycache__/%{oname}*
+%endif
+
+
+%changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-2
+- rebuilt with python-3.8.
+
+* Tue Aug 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-1
+- new upstream release.
+
+* Sun Feb 8 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.5-1
+- new upstream release.
+
+* Mon Jun 10 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.4-1
+- new upstream release.
+
+* Thu Oct 18 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.3-2
+- initial build for Vine Linux.
+
+* Wed Feb 01 2012 Terje Rosten <terje.rosten@ntnu.no> - 0.9.3-1
+- 0.9.3
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 02 2011 Terje Rosten <terje.rosten@ntnu.no> - 0.9.2-1
+- 0.9.2
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Feb 07 2011 Terje Rosten <terje.rosten@ntnu.no> - 0.9.1-1
+- 0.9.1
+
+* Wed Aug 25 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.9.0-3
+- rebuild with python3.2
+  http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.9.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Sat Jun 19 2010 Terje Rosten <terje.rosten@ntnu.no> - 0.9.0-1
+- 0.9.0
+- Add python 3 subpackage
+- License changed to MIT
+
+* Sun Dec 06 2009 Terje Rosten <terje.rosten@ntnu.no> - 0.8.8-1
+- 0.8.8
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.6-2.git20090518
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon May 18 2009 Terje Rosten <terje.rosten@ntnu.no> - 0.8.6-1.git20090518
+- Update to latest git, fixing bz #500934.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-2.git20090208
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb  8 2009 Terje Rosten <terje.rosten@ntnu.no> - 0.8.1-1.git20090208
+- 0.8.1
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.8.0-4.r
+- Rebuild for Python 2.6
+
+* Sun Jun 22 2008 Terje Rosten <terjeros@phys.ntnu.no> - 0.8.0-3.r
+- rebuild 
+
+* Tue Jun 17 2008 Terje Rosten <terjeros@phys.ntnu.no> - 0.8.0-2.r
+- 0.8.0r
+- add wrapper in /usr/bin
+
+* Mon Jun 16 2008 Terje Rosten <terjeros@phys.ntnu.no> - 0.8.0-1.q
+- 0.8.0q
+- Update url, license and source url
+
+* Sat Feb  9 2008 Terje Rosten <terjeros@phys.ntnu.no> - 0.7.1-2
+- Rebuild
+
+* Wed Aug 08 2007 Terje Rosten <terjeros@phys.ntnu.no> - 0.7.1-1
+- New upstream release: 0.7.1
+- Fix license tag
+
+* Mon Jun 25 2007 Terje Rosten <terjeros@phys.ntnu.no> - 0.7.0-3
+- Remove autopath from example package (bz #237464)
+
+* Tue Mar 27 2007 Terje Rosten <terjeros@phys.ntnu.no> - 0.7.0-2
+- Fix email address
+
+* Tue Mar  6 2007 Terje Rosten <terjeros@phys.ntnu.no> - 0.7.0-1
+- Initial build
+

+ 9 - 6
p/python-ipaddress/python-ipaddress-vl.spec

@@ -1,16 +1,15 @@
 %global pyname ipaddress
 %global pyname ipaddress
 
 
+Summary:        Port of the python 3.3+ ipaddress module to 2.6+
 Name:           python-%{pyname}
 Name:           python-%{pyname}
-Version:        1.0.22
+Version:        1.0.23
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        Port of the python 3.3+ ipaddress module to 2.6+
-
-License:        Python
-URL:            https://pypi.python.org/pypi/ipaddress/
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        Python
+URL:            https://pypi.python.org/pypi/ipaddress/
 Source0:        https://pypi.python.org/packages/source/i/%{pyname}/%{pyname}-%{version}.tar.gz
 Source0:        https://pypi.python.org/packages/source/i/%{pyname}/%{pyname}-%{version}.tar.gz
 
 
 BuildArch:      noarch
 BuildArch:      noarch
@@ -29,6 +28,7 @@ represents a valid IP address or network definition, and so on.
 
 
 %description %_description
 %description %_description
 
 
+
 %prep
 %prep
 %setup -q -n %{pyname}-%{version}
 %setup -q -n %{pyname}-%{version}
 
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.23-1
+- new upstream release.
+
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.22-1
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.22-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 38 - 48
p/python-jinja2/python-jinja2-vl.spec

@@ -1,24 +1,28 @@
 # async support is valid only on Python >= 3.6
 # async support is valid only on Python >= 3.6
-%bcond_with async
+%bcond_without async
 # Enable building without docs to avoid a circular dependency between this
 # Enable building without docs to avoid a circular dependency between this
 # and python-sphinx:
 # and python-sphinx:
 %bcond_with docs
 %bcond_with docs
 
 
 %global with_python3 1
 %global with_python3 1
 
 
-
-Name:		python-jinja2
-Version:	2.10
-Release:	2%{?_dist_release}
 Summary:	General purpose template engine
 Summary:	General purpose template engine
-Group:		Development/Languages
+Name:		python-jinja2
+Version:	2.11.2
+Release:	1%{?_dist_release}
+Group:		programming
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	BSD
 License:	BSD
-URL:		http://jinja.pocoo.org/
-Source0:	http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+URL:		https://jinja.palletsprojects.com/
+Source0:	https://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
+
 BuildArch:	noarch
 BuildArch:	noarch
-BuildRequires:	python-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	python-rpm-macros
 BuildRequires:	python-rpm-macros
+BuildRequires:	python-devel
+BuildRequires:	python2-rpm-macros
 BuildRequires:	python-setuptools
 BuildRequires:	python-setuptools
 BuildRequires:	python-markupsafe
 BuildRequires:	python-markupsafe
 %if %{with docs}
 %if %{with docs}
@@ -35,11 +39,6 @@ BuildRequires:	python3-markupsafe
 #Requires:	 python3-babel >= 0.8
 #Requires:	 python3-babel >= 0.8
 %endif # with_python3
 %endif # with_python3
 
 
-BuildRequires:	python-setuptools
-
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 Jinja2 is a template engine written in pure Python.  It provides a
 Jinja2 is a template engine written in pure Python.  It provides a
 Django inspired non-XML syntax but supports inline expressions and an
 Django inspired non-XML syntax but supports inline expressions and an
@@ -55,8 +54,9 @@ environments.
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-jinja2
 %package -n python3-jinja2
 Summary:	General purpose template engine
 Summary:	General purpose template engine
-Group:		Development/Languages
+Group:		programming
 Requires:	python3-markupsafe
 Requires:	python3-markupsafe
+Requires:	python3-babel
 
 
 %description -n python3-jinja2
 %description -n python3-jinja2
 Jinja2 is a template engine written in pure Python.  It provides a
 Jinja2 is a template engine written in pure Python.  It provides a
@@ -72,49 +72,37 @@ environments.
 
 
 
 
 %prep
 %prep
-%setup -qc -n Jinja2-%{version}
+%setup -q -n Jinja2-%{version}
 # cleanup
 # cleanup
-find Jinja2-%{version} -name '*.pyo' -o -name '*.pyc' -delete
+find . -name '*.pyo' -o -name '*.pyc' -delete
 
 
-# fix EOL
-sed -i 's|\r$||g' Jinja2-%{version}/LICENSE
-
-mv Jinja2-%{version} python3
-cp -av python3 python2
 
 
 %build
 %build
-pushd python2
-%py_build
+%py2_build
 %if %{with docs}
 %if %{with docs}
 make -C docs html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-2
 make -C docs html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-2
 %endif # with docs
 %endif # with docs
-popd
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
-pushd python3
 %py3_build
 %py3_build
 %if %{with docs}
 %if %{with docs}
 make -C docs html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
 make -C docs html PYTHONPATH=$(pwd) SPHINXBUILD=sphinx-build-3
 %endif # with docs
 %endif # with docs
-popd
 %endif # with_python3
 %endif # with_python3
 
 
 
 
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
-pushd python2
-%py_install
+%py2_install
 
 
 # remove hidden file
 # remove hidden file
 rm -rf docs/_build/html/.buildinfo
 rm -rf docs/_build/html/.buildinfo
 
 
 # these files are valid only on Python 3.6+
 # these files are valid only on Python 3.6+
-rm %{buildroot}%{python_sitelib}/jinja2/asyncsupport.py
-rm %{buildroot}%{python_sitelib}/jinja2/asyncfilters.py
-popd
+rm %{buildroot}%{python2_sitelib}/jinja2/asyncsupport.py
+rm %{buildroot}%{python2_sitelib}/jinja2/asyncfilters.py
 
 
 %if %{with python3}
 %if %{with python3}
-pushd python3
 %py3_install
 %py3_install
 
 
 # remove hidden file
 # remove hidden file
@@ -125,35 +113,34 @@ rm -rf docs/_build/html/.buildinfo
 rm %{buildroot}%{python3_sitelib}/jinja2/asyncsupport.py
 rm %{buildroot}%{python3_sitelib}/jinja2/asyncsupport.py
 rm %{buildroot}%{python3_sitelib}/jinja2/asyncfilters.py
 rm %{buildroot}%{python3_sitelib}/jinja2/asyncfilters.py
 %endif # ! with async
 %endif # ! with async
-popd
 %endif # with python3
 %endif # with python3
 
 
+
 %clean
 %clean
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc python2/AUTHORS
-%doc python2/CHANGES.rst
-%doc python2/ext
-%doc python2/examples
-%license python2/LICENSE
+%doc CHANGES.rst
+%doc ext
+%doc examples
+%license LICENSE*
 %if %{with docs}
 %if %{with docs}
-%doc python2/docs/_build/html
-%endif
+%doc docs/_build/html
+%endif # with docs
 %{python_sitelib}/jinja2
 %{python_sitelib}/jinja2
 %{python_sitelib}/Jinja2-%{version}-py*.egg-info
 %{python_sitelib}/Jinja2-%{version}-py*.egg-info
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python3-jinja2
 %files -n python3-jinja2
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc python3/AUTHORS
-%doc python3/CHANGES.rst
-%doc python3/ext
-%doc python3/examples
-%license python2/LICENSE
+%doc CHANGES.rst
+%doc ext
+%doc examples
+%license LICENSE*
 %if %{with docs}
 %if %{with docs}
-%doc python3/docs/_build/html
+%doc docs/_build/html
 %endif # with docs
 %endif # with docs
 %{python3_sitelib}/jinja2
 %{python3_sitelib}/jinja2
 %{python3_sitelib}/Jinja2-%{version}-py*.egg-info
 %{python3_sitelib}/Jinja2-%{version}-py*.egg-info
@@ -161,6 +148,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.11.2-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-2
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-2
 - fixed R:.
 - fixed R:.
 
 

+ 34 - 35
p/python-lxml/python-lxml-vl.spec

@@ -1,27 +1,30 @@
-%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-%{!?python3_sitearch: %global python3_sitearch %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
 %define _lxml lxml
 %define _lxml lxml
 Summary: lxml is a Pythonic binding for the libxml2 and libxslt libraries
 Summary: lxml is a Pythonic binding for the libxml2 and libxslt libraries
 Summary(ja): lxml は libxml2 と libxslt の Python バインディングです
 Summary(ja): lxml は libxml2 と libxslt の Python バインディングです
 Name: python-%{_lxml}
 Name: python-%{_lxml}
-Group: Development/Libraries
-Version: 3.8.0
+Group: programming
+Version: 4.5.2
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: BSD
 License: BSD
-URL: http://codespeak.net/lxml
+URL: https://lxml.de/
 #URL: http://pypi.python.org/pypi/lxml
 #URL: http://pypi.python.org/pypi/lxml
-Source: http://pypi.python.org/packages/source/l/%{_lxml}/%{_lxml}-%{version}.tar.gz
+Source: https://pypi.python.org/packages/source/l/%{_lxml}/%{_lxml}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 BuildRequires: libxml2-devel >= 2.6.21
 BuildRequires: libxml2-devel >= 2.6.21
 BuildRequires: libxslt-devel >= 1.1.15
 BuildRequires: libxslt-devel >= 1.1.15
+BuildRequires: python-rpm-macros
+
 BuildRequires: python-devel >= 2.3
 BuildRequires: python-devel >= 2.3
-BuildRequires: python3-devel
+BuildRequires: python2-rpm-macros
 BuildRequires: python-pyrex
 BuildRequires: python-pyrex
 
 
+BuildRequires: python3-devel
+BuildRequires: python3-rpm-macros
+
 %description
 %description
 lxml is a Pythonic binding for the libxml2_ and libxslt_ libraries.  It is
 lxml is a Pythonic binding for the libxml2_ and libxslt_ libraries.  It is
 unique in that it combines the speed and feature completeness of these
 unique in that it combines the speed and feature completeness of these
@@ -29,10 +32,11 @@ libraries with the simplicity of a native Python API, mostly compatible but
 superior to the well-known ElementTree_ API.  See the introduction_ for more
 superior to the well-known ElementTree_ API.  See the introduction_ for more
 information about background and goals.
 information about background and goals.
 
 
+
 %package -n python3-lxml
 %package -n python3-lxml
 Summary: lxml is a Pythonic binding for the libxml2 and libxslt libraries
 Summary: lxml is a Pythonic binding for the libxml2 and libxslt libraries
 Summary(ja): lxml は libxml2 と libxslt の Python バインディングです
 Summary(ja): lxml は libxml2 と libxslt の Python バインディングです
-Group: Development/Libraries
+Group: programming
 
 
 %description -n python3-lxml
 %description -n python3-lxml
 lxml is a Pythonic binding for the libxml2_ and libxslt_ libraries.  It is
 lxml is a Pythonic binding for the libxml2_ and libxslt_ libraries.  It is
@@ -41,52 +45,47 @@ libraries with the simplicity of a native Python API, mostly compatible but
 superior to the well-known ElementTree_ API.  See the introduction_ for more
 superior to the well-known ElementTree_ API.  See the introduction_ for more
 information about background and goals.
 information about background and goals.
 
 
-%prep
-%setup -q -T -c -n %{_lxml}-%{version}
 
 
-tar xvf %{SOURCE0}
-mv %{_lxml}-%{version} py2
+%prep
+%setup -q -n %{_lxml}-%{version}
 
 
-cp -a py2 py3
 
 
 %build
 %build
-pushd py2
-%{__python} setup.py build
-popd
+%py2_build
+%py3_build
 
 
-pushd py3
-python3 setup.py build
-popd
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
+%py2_install
+%py3_install
 
 
-pushd py2
-%{__python} setup.py install --root=$RPM_BUILD_ROOT
-popd
-
-pushd py3
-python3 setup.py install --root=$RPM_BUILD_ROOT
-popd
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc py2/CHANGES.txt py2/CREDITS.txt py2/LICENSES.txt py2/README.* py2/TODO.txt
-%doc py2/doc
-%{python_sitearch}/%{_lxml}
-%{python_sitearch}/%{_lxml}-*-info
+%license LICENSE*
+%doc CHANGES.txt CREDITS.txt README.* TODO.txt
+%doc doc
+%{python2_sitearch}/%{_lxml}
+%{python2_sitearch}/%{_lxml}-*-info
 
 
 %files -n python3-lxml
 %files -n python3-lxml
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc py3/CHANGES.txt py3/CREDITS.txt py3/LICENSES.txt py3/README.* py3/TODO.txt
-%doc py3/doc
+%license LICENSE*
+%doc CHANGES.txt CREDITS.txt README.* TODO.txt
+%doc doc
 %{python3_sitearch}/%{_lxml}
 %{python3_sitearch}/%{_lxml}
 %{python3_sitearch}/%{_lxml}-*-info
 %{python3_sitearch}/%{_lxml}-*-info
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.5.2-1
+- new upstream release.
+
 * Sat Sep 09 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.0-1
 * Sat Sep 09 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.0-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 23 - 25
p/python-markupsafe/python-markupsafe-vl.spec

@@ -1,37 +1,39 @@
 %global with_python3 1
 %global with_python3 1
 
 
+Summary: Implements a XML/HTML/XHTML Markup safe string for Python
 Name: python-markupsafe
 Name: python-markupsafe
-Version: 1.1.0
+Version: 1.1.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Summary: Implements a XML/HTML/XHTML Markup safe string for Python
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
-Group: Development/Languages
 License: BSD
 License: BSD
-URL: http://pypi.python.org/pypi/MarkupSafe
-Source0: http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: https://pypi.python.org/pypi/MarkupSafe
+Source0: https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz
 
 
-BuildRequires: python-devel python-setuptools python-rpm-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
+BuildRequires: python-rpm-macros
+BuildRequires: python-devel python-setuptools python2-rpm-macros
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 BuildRequires: python3-devel python3-setuptools python3-rpm-macros
 BuildRequires: python3-devel python3-setuptools python3-rpm-macros
 %endif # if with_python3
 %endif # if with_python3
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 A library for safe markup escaping.
 A library for safe markup escaping.
 
 
+
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-markupsafe
 %package -n python3-markupsafe
 Summary: Implements a XML/HTML/XHTML Markup safe string for Python
 Summary: Implements a XML/HTML/XHTML Markup safe string for Python
-Group: Development/Languages
+Group: programming
 
 
 %description -n python3-markupsafe
 %description -n python3-markupsafe
 A library for safe markup escaping.
 A library for safe markup escaping.
 %endif #if with_python3
 %endif #if with_python3
 
 
+
 %prep
 %prep
 %setup -q -n MarkupSafe-%{version}
 %setup -q -n MarkupSafe-%{version}
 
 
@@ -41,36 +43,29 @@ A library for safe markup escaping.
 %endif # with_python3
 %endif # with_python3
 
 
 %build
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
+export CFLAGS="$RPM_OPT_FLAGS"
+%py2_build
 %if 0%{?with_python3}
 %if 0%{?with_python3}
-pushd %{py3dir}
-CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
-popd
+%py3_build
 %endif # with_python3
 %endif # with_python3
 
 
 
 
 %install
 %install
 %__rm -rf $RPM_BUILD_ROOT
 %__rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%py2_install
 # C code errantly gets installed
 # C code errantly gets installed
 %__rm $RPM_BUILD_ROOT/%{python_sitearch}/markupsafe/*.c
 %__rm $RPM_BUILD_ROOT/%{python_sitearch}/markupsafe/*.c
-
 %if 0%{?with_python3}
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%py3_install
 %__rm $RPM_BUILD_ROOT/%{python3_sitearch}/markupsafe/*.c
 %__rm $RPM_BUILD_ROOT/%{python3_sitearch}/markupsafe/*.c
-popd
 %endif # with_python3
 %endif # with_python3
 
 
 
 
 %check
 %check
-%{__python} setup.py test
+%{__python2} setup.py test
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
-pushd %{py3dir}
 %{__python3} setup.py test
 %{__python3} setup.py test
-popd
 %endif # with_python3
 %endif # with_python3
 
 
 %clean
 %clean
@@ -81,7 +76,7 @@ popd
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE*
 %license LICENSE*
 %doc CHANGES* README*
 %doc CHANGES* README*
-%{python_sitearch}/*
+%{python2_sitearch}/*
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python3-markupsafe
 %files -n python3-markupsafe
@@ -93,6 +88,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1-1
+- new upstream release.
+
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 25 - 17
p/python-nose/python-nose-vl.spec

@@ -1,18 +1,16 @@
 %define modname nose
 %define modname nose
-%define pkg_release	1%{?_dist_release}
 
 
-Name:		python-nose
-Version:	1.3.7
-Release:	%{pkg_release}
 Summary:	A discovery-based unittest extension for Python
 Summary:	A discovery-based unittest extension for Python
 Summary(ja):	Python 用の発見型ユニットテスト・エクステンション
 Summary(ja):	Python 用の発見型ユニットテスト・エクステンション
-
-Group:		Development/Languages
-License:	LGPLv2
-URL:		http://somethingaboutorange.com/mrl/projects/nose/
+Name:		python-nose
+Version:	1.3.7
+Release:	1%{?_dist_release}
+Group:          programming
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 
 
+License:	LGPLv2
+URL:		http://somethingaboutorange.com/mrl/projects/nose/
 Source0:	http://somethingaboutorange.com/mrl/projects/nose/nose-%{version}.tar.gz
 Source0:	http://somethingaboutorange.com/mrl/projects/nose/nose-%{version}.tar.gz
 
 
 # Make compatible with coverage 4.1
 # Make compatible with coverage 4.1
@@ -35,7 +33,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 BuildArch:	noarch
 BuildArch:	noarch
 BuildRequires:	dos2unix
 BuildRequires:	dos2unix
-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-devel, python3-setuptools, python3-rpm-macros
 Requires:	python-setuptools
 Requires:	python-setuptools
 
 
@@ -51,7 +50,7 @@ reasonably possible without resorting to too much magic.
 %package -n python3-nose
 %package -n python3-nose
 Summary:	A discovery-based unittest extension for Python
 Summary:	A discovery-based unittest extension for Python
 Summary(ja):	Python 用の発見型ユニットテスト・エクステンション
 Summary(ja):	Python 用の発見型ユニットテスト・エクステンション
-Group:		Development/Languages
+Group:          programming
 Requires:	python3-setuptools
 Requires:	python3-setuptools
 
 
 %description -n python3-nose
 %description -n python3-nose
@@ -61,6 +60,7 @@ nose provides an alternate test discovery and running process for unittest,
 one that is intended to mimic the behavior of py.test as much as is
 one that is intended to mimic the behavior of py.test as much as is
 reasonably possible without resorting to too much magic.
 reasonably possible without resorting to too much magic.
 
 
+
 %prep
 %prep
 %setup -qc
 %setup -qc
 pushd %{modname}-%{version}
 pushd %{modname}-%{version}
@@ -71,20 +71,22 @@ popd
 mv %{modname}-%{version} python2
 mv %{modname}-%{version} python2
 cp -pr python2 python3
 cp -pr python2 python3
 
 
+
 %build
 %build
 pushd python2
 pushd python2
-%py_build
+%py2_build
 popd
 popd
 pushd python3
 pushd python3
 %py3_build
 %py3_build
 popd
 popd
 
 
+
 %install
 %install
 rm -rf ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
 
 
 mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_mandir}/man1
 pushd python2
 pushd python2
-%py_install
+%py2_install
 mv %{buildroot}%{_bindir}/nosetests{,-%{python_version}}
 mv %{buildroot}%{_bindir}/nosetests{,-%{python_version}}
 ln -sf nosetests-%{python_version} %{buildroot}%{_bindir}/nosetests-2
 ln -sf nosetests-%{python_version} %{buildroot}%{_bindir}/nosetests-2
 mv %{buildroot}%{_prefix}/man/man1/nosetests.1 %{buildroot}%{_mandir}/man1/nosetests-%{python_version}.1
 mv %{buildroot}%{_prefix}/man/man1/nosetests.1 %{buildroot}%{_mandir}/man1/nosetests-%{python_version}.1
@@ -98,27 +100,28 @@ mv %{buildroot}%{_prefix}/man/man1/nosetests.1 %{buildroot}%{_mandir}/man1/noset
 ln -sf nosetests-%{python3_version}.1 %{buildroot}%{_mandir}/man1/nosetests-3.1
 ln -sf nosetests-%{python3_version}.1 %{buildroot}%{_mandir}/man1/nosetests-3.1
 popd
 popd
 
 
-ln -sf nosetests-2 %{buildroot}%{_bindir}/nosetests
-ln -sf nosetests-2.1 %{buildroot}%{_mandir}/man1/nosetests.1
+ln -sf nosetests-3 %{buildroot}%{_bindir}/nosetests
+ln -sf nosetests-3.1 %{buildroot}%{_mandir}/man1/nosetests.1
+
 
 
 %check
 %check
 pushd python2
 pushd python2
-%{__python} selftest.py
+%{__python2} selftest.py
 popd
 popd
 pushd python3
 pushd python3
 %{__python3} setup.py build_tests
 %{__python3} setup.py build_tests
 %{__python3} selftest.py
 %{__python3} selftest.py
 popd
 popd
 
 
+
 %clean
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
 %doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
-%{_bindir}/nosetests
 %{_bindir}/nosetests-2*
 %{_bindir}/nosetests-2*
-%{_mandir}/man1/nosetests.1*
 %{_mandir}/man1/nosetests-2*
 %{_mandir}/man1/nosetests-2*
 %{python_sitelib}/nose-%{version}-py%{pyver}.egg-info
 %{python_sitelib}/nose-%{version}-py%{pyver}.egg-info
 %{python_sitelib}/nose
 %{python_sitelib}/nose
@@ -126,12 +129,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %files -n python3-nose
 %files -n python3-nose
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
 %doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
+%{_bindir}/nosetests
 %{_bindir}/nosetests-3*
 %{_bindir}/nosetests-3*
+%{_mandir}/man1/nosetests.1*
 %{_mandir}/man1/nosetests-3*
 %{_mandir}/man1/nosetests-3*
 %{python3_sitelib}/nose-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/nose-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/nose
 %{python3_sitelib}/nose
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7-2
+- built with python-3.8.
+
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7-1
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 16 - 11
p/python-packaging/python-packaging-vl.spec

@@ -4,21 +4,23 @@
 #global build_wheel 1
 #global build_wheel 1
 %global with_python3 1
 %global with_python3 1
 
 
-Name:           python-%{pypi_name}
-Version:        18.0
-Release:        1%{?dist}
 Summary:        Core utilities for Python packages
 Summary:        Core utilities for Python packages
-
-License:        BSD or ASL 2.0
-URL:            https://github.com/pypa/packaging
+Name:           python-%{pypi_name}
+Version:        20.4
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        BSD or ASL 2.0
+URL:            https://github.com/pypa/packaging
 Source0:        https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Source0:        https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+
 BuildArch:      noarch
 BuildArch:      noarch
 
 
 # Dependencies with different names in Fedora and Epel7
 # Dependencies with different names in Fedora and Epel7
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-pyparsing
 BuildRequires:  python-pyparsing
@@ -67,14 +69,14 @@ dealing with versions, specifiers, markers etc.
 rm -rf %{pypi_name}.egg-info
 rm -rf %{pypi_name}.egg-info
 
 
 %build
 %build
-%py_build
+%py2_build
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_build
 %py3_build
 %endif
 %endif
 
 
 %install
 %install
-%py_install
+%py2_install
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
@@ -82,15 +84,15 @@ rm -rf %{pypi_name}.egg-info
 
 
 %check
 %check
 %if %{with test}
 %if %{with test}
-%{__python} -m pytest tests/
+%{__python2} -m pytest tests/
 %{__python3} -m pytest tests/
 %{__python3} -m pytest tests/
 %endif
 %endif
 
 
 %files
 %files
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
-%{python_sitelib}/%{pypi_name}/
-%{python_sitelib}/%{pypi_name}-*-info/
+%{python2_sitelib}/%{pypi_name}/
+%{python2_sitelib}/%{pypi_name}-*-info/
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %files -n python3-%{pypi_name}
@@ -101,6 +103,9 @@ rm -rf %{pypi_name}.egg-info
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 20.4-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 18.0-1
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 18.0-1
 - new upstream release.
 - new upstream release.
 - initial build for Vine Linux.
 - initial build for Vine Linux.

+ 14 - 7
p/python-pillow/python-pillow-vl.spec

@@ -9,9 +9,9 @@
 
 
 Name:           python-%{srcname}
 Name:           python-%{srcname}
 Version:        7.2.0
 Version:        7.2.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Python image processing library
 Summary:        Python image processing library
-Group:          Development/Libraries
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
@@ -33,11 +33,6 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  tk-devel
 BuildRequires:  tk-devel
 BuildRequires:  zlib-devel
 BuildRequires:  zlib-devel
 
 
-BuildRequires:  python-devel
-BuildRequires:  numpy
-#BuildRequires:  python-olefile
-BuildRequires:  python-setuptools
-
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-cffi
 BuildRequires:  python3-cffi
@@ -68,6 +63,7 @@ devel (development) and doc (documentation).
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-%{srcname}
 %package -n python3-%{srcname}
 Summary:        Python 3 image processing library
 Summary:        Python 3 image processing library
+Group:          programming
 Requires:       ghostscript
 Requires:       ghostscript
 %{?python_provide:%python_provide python3-%{srcname}}
 %{?python_provide:%python_provide python3-%{srcname}}
 Provides:       python3-imaging = %{version}-%{release}
 Provides:       python3-imaging = %{version}-%{release}
@@ -84,6 +80,7 @@ devel (development) and doc (documentation).
 
 
 %package -n python3-%{srcname}-devel
 %package -n python3-%{srcname}-devel
 Summary:        Development files for %{srcname}
 Summary:        Development files for %{srcname}
+Group:          programming
 Requires:       python3-devel, libjpeg-devel, zlib-devel
 Requires:       python3-devel, libjpeg-devel, zlib-devel
 Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
 Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-%{srcname}-devel}
 %{?python_provide:%python_provide python3-%{srcname}-devel}
@@ -95,6 +92,7 @@ Development files for %{srcname}.
 
 
 %package -n python3-%{srcname}-doc
 %package -n python3-%{srcname}-doc
 Summary:        Documentation for %{srcname}
 Summary:        Documentation for %{srcname}
+Group:          documentation
 BuildArch:      noarch
 BuildArch:      noarch
 Requires:       python3-%{srcname} = %{version}-%{release}
 Requires:       python3-%{srcname} = %{version}-%{release}
 %{?python_provide:%python_provide python3-%{srcname}-doc}
 %{?python_provide:%python_provide python3-%{srcname}-doc}
@@ -107,6 +105,7 @@ Documentation for %{srcname}.
 
 
 %package -n python3-%{srcname}-tk
 %package -n python3-%{srcname}-tk
 Summary:        Tk interface for %{srcname}
 Summary:        Tk interface for %{srcname}
+Group:          programming
 Requires:       python3-tkinter
 Requires:       python3-tkinter
 Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
 Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-%{srcname}-tk}
 %{?python_provide:%python_provide python3-%{srcname}-tk}
@@ -118,6 +117,7 @@ Tk interface for %{name}.
 
 
 %package -n python3-%{srcname}-qt
 %package -n python3-%{srcname}-qt
 Summary:        Qt %{srcname} image wrapper
 Summary:        Qt %{srcname} image wrapper
+Group:          programming
 Requires:       python3-qt5
 Requires:       python3-qt5
 Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
 Requires:       python3-%{srcname}%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python3-%{srcname}-qt}
 %{?python_provide:%python_provide python3-%{srcname}-qt}
@@ -137,11 +137,13 @@ Qt %{srcname} image wrapper.
 # Build Python 3 modules
 # Build Python 3 modules
 %py3_build
 %py3_build
 
 
+%ifarch x86_64
 %if 0%{?with_docs}
 %if 0%{?with_docs}
 PYTHONPATH=$PWD/build/%py3_libbuilddir make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version
 PYTHONPATH=$PWD/build/%py3_libbuilddir make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version
 rm -f docs/_build_py3/html/.buildinfo
 rm -f docs/_build_py3/html/.buildinfo
 %endif
 %endif
 %endif
 %endif
+%endif
 
 
 
 
 %install
 %install
@@ -182,10 +184,12 @@ popd
 %files -n python3-%{srcname}-devel
 %files -n python3-%{srcname}-devel
 %{py3_incdir}/Imaging/
 %{py3_incdir}/Imaging/
 
 
+%ifarch x86_64
 %files -n python3-%{srcname}-doc
 %files -n python3-%{srcname}-doc
 %if 0%{?with_docs}
 %if 0%{?with_docs}
 %doc docs/_build_py3/html
 %doc docs/_build_py3/html
 %endif
 %endif
+%endif
 
 
 %files -n python3-%{srcname}-tk
 %files -n python3-%{srcname}-tk
 %{python3_sitearch}/PIL/_imagingtk*
 %{python3_sitearch}/PIL/_imagingtk*
@@ -201,6 +205,9 @@ popd
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.2.0-2
+- built with python-3.8.
+
 * Fri Jul 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.2.0-1
 * Fri Jul 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.2.0-1
 - new upstream release.
 - new upstream release.
 - dropped python2 support.
 - dropped python2 support.

+ 78 - 23
p/python-pip/python-pip-vl.spec

@@ -1,11 +1,14 @@
 %bcond_with bootstrap
 %bcond_with bootstrap
+%bcond_without python2
 %bcond_without python3
 %bcond_without python3
 
 
 %global srcname pip
 %global srcname pip
 
 
 %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
 %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
 %if %{without bootstrap}
 %if %{without bootstrap}
+%if %{with python2}
 %global python2_wheelname %python_wheelname
 %global python2_wheelname %python_wheelname
+%endif
 %if %{with python3}
 %if %{with python3}
 %global python3_wheelname %python_wheelname
 %global python3_wheelname %python_wheelname
 %endif
 %endif
@@ -14,10 +17,12 @@
 Summary:        Pip installs Python packages.  An easy_install replacement
 Summary:        Pip installs Python packages.  An easy_install replacement
 Summary(ja):    Pip は easy_install を置き換える Python パッケージインストーラです。
 Summary(ja):    Pip は easy_install を置き換える Python パッケージインストーラです。
 Name:           python-%{srcname}
 Name:           python-%{srcname}
-Version:        20.0.2
+Version:        20.2.2
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Libraries
 License:        MIT
 License:        MIT
 URL:            https://pip.pypa.io/en/stable/
 URL:            https://pip.pypa.io/en/stable/
 Source0:        https://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
 Source0:        https://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
@@ -33,19 +38,28 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildArch:      noarch
 BuildArch:      noarch
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-rpm-macros
+
+%if %{with python2}
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-Requires:       python-setuptools
 %if %{without bootstrap}
 %if %{without bootstrap}
 BuildRequires:  python-pip
 BuildRequires:  python-pip
 BuildRequires:  python-wheel
 BuildRequires:  python-wheel
 %endif
 %endif
+Requires:       python-setuptools
+Requires(post,postun): alternatives
+%endif
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
+%if %{with python3}
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%if %{without bootstrap}
+BuildRequires:  python3-pip
+BuildRequires:  python3-wheel
+%endif
+%endif
 
 
 %description
 %description
 pip is a package management system used to install and manage software packages
 pip is a package management system used to install and manage software packages
@@ -54,36 +68,33 @@ written in Python. Many packages can be found in the Python Package Index
 Packages" or "Pip Installs Python".
 Packages" or "Pip Installs Python".
 
 
 
 
-%package -n python3-%{srcname}
+%if %{with python3}
+%package -n     python3-%{srcname}
 Summary:        A tool for installing and managing Python3 packages
 Summary:        A tool for installing and managing Python3 packages
-Group:          Development/Libraries
-%if %{without bootstrap}
-BuildRequires:  python3-pip
-BuildRequires:  python3-wheel
-%endif
+Group:          programming
 Requires:       python3-setuptools
 Requires:       python3-setuptools
+Requires(post,postun): alternatives
 
 
 %description -n python3-%{srcname}
 %description -n python3-%{srcname}
 pip is a package management system used to install and manage software packages
 pip is a package management system used to install and manage software packages
 written in Python. Many packages can be found in the Python Package Index
 written in Python. Many packages can be found in the Python Package Index
 (PyPI). pip is a recursive acronym that can stand for either "Pip Installs
 (PyPI). pip is a recursive acronym that can stand for either "Pip Installs
 Packages" or "Pip Installs Python".
 Packages" or "Pip Installs Python".
+%endif
 
 
 
 
 %prep
 %prep
 %setup -q -n %{srcname}-%{version}
 %setup -q -n %{srcname}-%{version}
-# %patch0 -p1
-# %patch1 -p1
 
 
-# Remove ordereddict as it is only required for python <= 2.6
-#rm pip/_vendor/ordereddict.py
 
 
 %build
 %build
+%if %{with python2}
 %if %{without bootstrap}
 %if %{without bootstrap}
 %py_build_wheel
 %py_build_wheel
 %else
 %else
 %py_build
 %py_build
 %endif
 %endif
+%endif
 
 
 %if %{with python3}
 %if %{with python3}
 %if %{without bootstrap}
 %if %{without bootstrap}
@@ -103,39 +114,83 @@ Packages" or "Pip Installs Python".
 %else
 %else
 %py3_install
 %py3_install
 %endif
 %endif
-
-# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have  to
-# (pip install wheel doesn't overwrite)
 rm %{buildroot}%{_bindir}/pip
 rm %{buildroot}%{_bindir}/pip
 %endif # with python3
 %endif # with python3
 
 
+%if %{with python2}
 %if %{without bootstrap}
 %if %{without bootstrap}
-%py_install_wheel %{python_wheelname}
+%py2_install_wheel %{python_wheelname}
 %else
 %else
 %py_install
 %py_install
 %endif
 %endif
+rm %{buildroot}%{_bindir}/pip
+%endif # with python2
 
 
 
 
 %clean
 %clean
 %{__rm} -rf %{buildroot}
 %{__rm} -rf %{buildroot}
 
 
+
+%if %{with python2}
+%pre
+if [ ! -L %{_bindir}/%{srcname} ]; then
+  rm -f %{_bindir}/%{srcname}
+fi
+
+%post
+/sbin/update-alternatives \
+  --install %{_bindir}/%{srcname} %{srcname} \
+  %{_bindir}/%{srcname}%{python_version} %{python_version_nodots}
+
+%preun
+if [ "$1" = 0 ]; then
+  /sbin/update-alternatives \
+    --remove %{srcname} %{_bindir}/%{srcname}%{python_version}
+fi
+%endif
+
+%if %{with python3}
+%pre -n python3-%{srcname}
+if [ ! -L %{_bindir}/%{srcname} ]; then
+  rm -f %{_bindir}/%{srcname}
+fi
+
+%post -n python3-%{srcname}
+/sbin/update-alternatives \
+  --install %{_bindir}/%{srcname} %{srcname} \
+  %{_bindir}/%{srcname}%{python3_version} %{python3_version_nodots}
+
+%preun -n python3-%{srcname}
+if [ "$1" = 0 ]; then
+  /sbin/update-alternatives \
+    --remove %{srcname} %{_bindir}/%{srcname}%{python3_version}
+fi
+%endif
+
+
+%if %{with python2}
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE.txt
 %license LICENSE.txt
 %doc README.rst docs
 %doc README.rst docs
-%attr(755,root,root) %{_bindir}/pip
 %attr(755,root,root) %{_bindir}/pip2*
 %attr(755,root,root) %{_bindir}/pip2*
 %{python_sitelib}/pip*
 %{python_sitelib}/pip*
+%endif
 
 
+%if %{with python3}
 %files -n python3-pip
 %files -n python3-pip
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE.txt
 %license LICENSE.txt
 %doc README.rst docs
 %doc README.rst docs
 %attr(755,root,root) %{_bindir}/pip3*
 %attr(755,root,root) %{_bindir}/pip3*
 %{python3_sitelib}/pip*
 %{python3_sitelib}/pip*
+%endif
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.2.2-1
+- new upstream release.
+
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.0.2-1
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.0.2-1
 - new upstream release.
 - new upstream release.
 
 

+ 25 - 23
p/python-pycparser/python-pycparser-vl.spec

@@ -2,29 +2,26 @@
 
 
 Name:           python-pycparser
 Name:           python-pycparser
 Summary:        C parser and AST generator written in Python
 Summary:        C parser and AST generator written in Python
-Version:        2.19
-Release:        1%{?dist}
-License:        BSD
-Group:          System Environment/Libraries
-URL:            http://github.com/eliben/pycparser
-
+Version:        2.20
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
-Source0:        https://pypi.org/simple/pycparser/pycparser-%{version}.tar.gz
+License:        BSD
+URL:            http://github.com/eliben/pycparser
+Source0:        https://github.com/eliben/pycparser/archive/release_v%{version}.tar.gz#/pycparser-%{version}.tar.gz
 Source1:        pycparser-0.91.1-remove-relative-sys-path.py
 Source1:        pycparser-0.91.1-remove-relative-sys-path.py
 
 
-Patch100:       pycparser-2.10-ply.patch
-# This is Fedora-specific; I don't think we should request upstream to
-# remove embedded libraries from their distribuution, when we can remove
-# them during packaging.
-
 BuildArch:      noarch
 BuildArch:      noarch
 
 
+BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel python-setuptools
 BuildRequires:  python-devel python-setuptools
 %{?python_provide:%python_provide python-pycparser}
 %{?python_provide:%python_provide python-pycparser}
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
+BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-devel python3-setuptools
 BuildRequires:  python3-devel python3-setuptools
 %endif # if with_python3
 %endif # if with_python3
 
 
@@ -35,10 +32,11 @@ pycparser is a complete parser for the C language, written in pure Python.
 It is a module designed to be easily integrated into applications that
 It is a module designed to be easily integrated into applications that
 need to parse C source code.
 need to parse C source code.
 
 
+
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-pycparser
 %package -n python3-pycparser
 Summary:        C parser and AST generator written in Python
 Summary:        C parser and AST generator written in Python
-Group:          System Environment/Libraries
+Group:          programming
 %{?python_provide:%python_provide python3-pycparser}
 %{?python_provide:%python_provide python3-pycparser}
 
 
 %description -n python3-pycparser
 %description -n python3-pycparser
@@ -47,21 +45,19 @@ It is a module designed to be easily integrated into applications that
 need to parse C source code.
 need to parse C source code.
 %endif # if with_python3
 %endif # if with_python3
 
 
-%prep
-%setup -q -n pycparser-%{version}
-#patch100 -p1 -F5 -b .ply
 
 
-# remove embedded copy of ply
-#rm -rf pycparser/ply
+%prep
+%setup -q -n pycparser-release_v%{version}
 
 
 # examples
 # examples
-%{__python} %{SOURCE1} examples
+%{__python2} %{SOURCE1} examples
 dos2unix LICENSE
 dos2unix LICENSE
 
 
+
 %build
 %build
-%py_build
+%py2_build
 pushd build/lib/pycparser
 pushd build/lib/pycparser
-%{__python} _build_tables.py
+%{__python2} _build_tables.py
 popd
 popd
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
@@ -71,19 +67,21 @@ pushd build/lib/pycparser
 popd
 popd
 %endif # with_python3
 %endif # with_python3
 
 
+
 %install
 %install
-%py_install
+%py2_install
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
 %endif # with_python3
 %endif # with_python3
 
 
+
 %check
 %check
 #%{__python2} tests/all_tests.py 
 #%{__python2} tests/all_tests.py 
-
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 #%{__python3} tests/all_tests.py 
 #%{__python3} tests/all_tests.py 
 %endif # with_python3
 %endif # with_python3
+
  
  
 %files
 %files
 %license LICENSE
 %license LICENSE
@@ -99,7 +97,11 @@ popd
 %{python3_sitelib}/pycparser-*.egg-info
 %{python3_sitelib}/pycparser-*.egg-info
 %endif # with_python3
 %endif # with_python3
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.20-1
+- new upstream release.
+
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.19-1
 * Mon Nov 19 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.19-1
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 - new upstream release.
 - new upstream release.

+ 13 - 12
p/python-pycurl/python-pycurl-vl.spec

@@ -1,26 +1,26 @@
 %define modname pycurl
 %define modname pycurl
 
 
 Name:           python-%{modname}
 Name:           python-%{modname}
-Version:        7.43.0.2
+Version:        7.43.0.4
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A Python interface to libcurl
 Summary:        A Python interface to libcurl
 Summary(ja):    libcurl の Python インタフェース
 Summary(ja):    libcurl の Python インタフェース
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Languages
 License:        LGPLv2+
 License:        LGPLv2+
-URL:            http://pycurl.sourceforge.net/
-Source0:        http://pycurl.sourceforge.net/download/pycurl-%{version}.tar.gz
-# fix programming mistakes detected by static analyzers
-# upstream pull request: https://github.com/pycurl/pycurl/pull/550
-Patch1:         0001-python-pycurl-7.43.0.2-static-analysis.patch
-
+URL:            http://pycurl.io/
+Source0:        https://dl.bintray.com/pycurl/pycurl/pycurl-%{version}.tar.gz
 # drop link-time vs. run-time TLS backend check (#1446850)
 # drop link-time vs. run-time TLS backend check (#1446850)
 Patch2:         0002-python-pycurl-7.43.0-tls-backend.patch
 Patch2:         0002-python-pycurl-7.43.0-tls-backend.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
-BuildRequires:  python-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+
+BuildRequires:  python-devel
+BuildRequires:  python2-rpm-macros
 BuildRequires:  curl-devel >= 7.19.0
 BuildRequires:  curl-devel >= 7.19.0
 BuildRequires:  openssl-devel
 BuildRequires:  openssl-devel
 BuildRequires:  openldap-devel
 BuildRequires:  openldap-devel
@@ -37,9 +37,6 @@ Requires:	curl >= %{libcurl_ver}
 
 
 Provides:       %{modname} = %{version}-%{release}
 Provides:       %{modname} = %{version}-%{release}
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 PycURL is a Python interface to libcurl. PycURL can be used to fetch
 PycURL is a Python interface to libcurl. PycURL can be used to fetch
 objects identified by a URL from a Python program, similar to the
 objects identified by a URL from a Python program, similar to the
@@ -50,6 +47,7 @@ of features.
 %package -n python3-%{modname}
 %package -n python3-%{modname}
 Summary:        A Python3 interface to libcurl
 Summary:        A Python3 interface to libcurl
 Summary(ja):    libcurl の Python3 インタフェース
 Summary(ja):    libcurl の Python3 インタフェース
+Group:          programming
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
 
 
@@ -112,6 +110,9 @@ rm -rf %{buildroot}
 %{python3_sitearch}/*
 %{python3_sitearch}/*
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.43.0.4-1
+- new upstream release: the latest version with python2 support.
+
 * Wed Apr 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.43.0.2-1
 * Wed Apr 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.43.0.2-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 18 - 25
p/python-pygments/python-pygments-vl.spec

@@ -4,11 +4,13 @@
 %global srcname pygments
 %global srcname pygments
 
 
 Name:           python-pygments
 Name:           python-pygments
-Version:        2.5.2
+Version:        2.6.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        A syntax highlighting engine written in Python
 Summary:        A syntax highlighting engine written in Python
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Libraries
 License:        BSD
 License:        BSD
 URL:            http://pygments.org/
 URL:            http://pygments.org/
 Source0:        https://pypi.python.org/packages/source/P/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
 Source0:        https://pypi.python.org/packages/source/P/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
@@ -16,17 +18,13 @@ Source0:        https://pypi.python.org/packages/source/P/%{upstream_name}/%{ups
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 BuildArch:      noarch
 BuildArch:      noarch
-BuildRequires:  python-devel >= 2.4, python-setuptools, python-nose
-BuildRequires:  python-sphinx
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 BuildRequires:  python3-devel, python3-setuptools, python3-nose
 BuildRequires:  python3-devel, python3-setuptools, python3-nose
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-sphinx
 %endif # if with_python3
 %endif # if with_python3
-Requires:       python-setuptools
-
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 %description
 %description
 Pygments is a generic syntax highlighter for general use in all kinds
 Pygments is a generic syntax highlighter for general use in all kinds
@@ -46,8 +44,9 @@ need to prettify source code. Highlights are:
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-pygments
 %package -n python3-pygments
 Summary:        A syntax highlighting engine written in Python 3
 Summary:        A syntax highlighting engine written in Python 3
-Group:          Development/Libraries
+Group:          programming
 Requires:       python3-setuptools
 Requires:       python3-setuptools
+Obsoletes:      python-pygments < 2.6.0
 
 
 %description -n python3-pygments
 %description -n python3-pygments
 Pygments is a generic syntax highlighter for general use in all kinds
 Pygments is a generic syntax highlighter for general use in all kinds
@@ -71,12 +70,10 @@ need to prettify source code. Highlights are:
 
 
 %build
 %build
 %{__sed} -i 's/\r//' LICENSE
 %{__sed} -i 's/\r//' LICENSE
-
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_build
 %py3_build
 %endif
 %endif
 
 
-%py_build
 
 
 %install
 %install
 %__rm -rf $RPM_BUILD_ROOT
 %__rm -rf $RPM_BUILD_ROOT
@@ -86,19 +83,18 @@ need to prettify source code. Highlights are:
 %py3_install
 %py3_install
 %endif
 %endif
 
 
-# Python 2 install
-# NOTE: sphinx is built on Python2 and packages with python2 and python3
-%py_install
-%{__python} setup.py build_sphinx
+%{__python3} setup.py build_sphinx
 pushd doc
 pushd doc
 install -d %{buildroot}%{_mandir}/man1
 install -d %{buildroot}%{_mandir}/man1
 mv pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1
 mv pygmentize.1 $RPM_BUILD_ROOT%{_mandir}/man1/pygmentize.1
 popd
 popd
 cp -r doc/docs doc/reST
 cp -r doc/docs doc/reST
 
 
+
 %clean
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 %__rm -rf $RPM_BUILD_ROOT
 
 
+
 %if %{with test}
 %if %{with test}
 %check
 %check
 make test PYTHON=%{__python}
 make test PYTHON=%{__python}
@@ -107,14 +103,6 @@ make test PYTHON=%{__python3}
 %endif
 %endif
 %endif
 %endif
 
 
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES build/sphinx/html doc/reST TODO
-%license LICENSE
-# For noarch packages: sitelib
-%{python_sitelib}/*
-%{_bindir}/pygmentize
-%lang(en) %{_mandir}/man1/pygmentize.1*
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python3-pygments
 %files -n python3-pygments
@@ -122,13 +110,18 @@ make test PYTHON=%{__python3}
 %doc AUTHORS CHANGES build/sphinx/html doc/reST TODO
 %doc AUTHORS CHANGES build/sphinx/html doc/reST TODO
 %license LICENSE
 %license LICENSE
 %{python3_sitelib}/*
 %{python3_sitelib}/*
-#{_bindir}/pygmentize
-#lang(en) %{_mandir}/man1/pygmentize.1*
+%{_bindir}/pygmentize
+%lang(en) %{_mandir}/man1/pygmentize.1*
 %endif # with_python3
 %endif # with_python3
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.6.1-1
+- new upstream release.
+- built with python3 only.
+
 * Sat Feb 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.2-1
 * Sat Feb 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.2-1
+- new upstream release.
 
 
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.3.0-2
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.3.0-2
 - packed pygmentize for python2.
 - packed pygmentize for python2.

+ 13 - 11
p/python-pysocks/python-pysocks-vl.spec

@@ -2,25 +2,23 @@
 %global modname     pysocks
 %global modname     pysocks
 %global sum         A Python SOCKS client module
 %global sum         A Python SOCKS client module
 
 
-Name:               python-%{modname}
-Version:            1.6.8
-Release:            7%{?_dist_release}
 Summary:            %{sum}
 Summary:            %{sum}
-
-License:            BSD
-URL:                https://github.com/Anorov/%{pypi_name}
-
+Name:               python-%{modname}
+Version:            1.7.1
+Release:            1%{?_dist_release}
+Group:              programming
 Vendor:             Project Vine
 Vendor:             Project Vine
 Distribution:       Vine Linux
 Distribution:       Vine Linux
 
 
+License:            BSD
+URL:                https://github.com/Anorov/%{pypi_name}
 Source0:            https://files.pythonhosted.org/packages/source/P/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Source0:            https://files.pythonhosted.org/packages/source/P/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 
 
 BuildArch:          noarch
 BuildArch:          noarch
-Patch0:             https://github.com/Anorov/PySocks/commit/d74c3f1d34d07a001656453823a153ea0c865449.patch
-
 BuildRequires:      python-devel
 BuildRequires:      python-devel
 BuildRequires:      python-setuptools
 BuildRequires:      python-setuptools
 BuildRequires:      python-rpm-macros
 BuildRequires:      python-rpm-macros
+BuildRequires:      python2-rpm-macros
 %{?python_provide:%python_provide python2-%{modname}}
 %{?python_provide:%python_provide python2-%{modname}}
 
 
 %global _description \
 %global _description \
@@ -39,6 +37,7 @@ Acts as a drop-in replacement to the socket module. Featuring:\
 
 
 %package -n python3-%{modname}
 %package -n python3-%{modname}
 Summary:            %{sum}
 Summary:            %{sum}
+Group:              programming
 BuildRequires:      python3-devel
 BuildRequires:      python3-devel
 BuildRequires:      python3-setuptools
 BuildRequires:      python3-setuptools
 BuildRequires:      python3-rpm-macros
 BuildRequires:      python3-rpm-macros
@@ -55,11 +54,11 @@ This package is for Python3 version %{python3_version} only.
 rm -rfv test/bin
 rm -rfv test/bin
 
 
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
 %install
 %install
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
 %check
 %check
@@ -82,6 +81,9 @@ rm -rfv test/bin
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7.1-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.6.8-7
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.6.8-7
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 44 - 18
p/python-qt5/python-qt5-vl.spec

@@ -43,18 +43,17 @@
 
 
 %global py3_sipdir %{_datadir}/sip/PyQt5
 %global py3_sipdir %{_datadir}/sip/PyQt5
 
 
-Summary: PyQt5 is Python bindings for Qt5
-Name: 	 python-qt5 
-Version: 5.12.3
-Release: 3%{?_dist_release}
-
+Summary:        PyQt5 is Python bindings for Qt5
+Name:           python-qt5 
+Version:        5.15.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
-# all BSD, except for GPLv2+ dbus bindings and examples
-License: BSD and GPLv2+
+License: GPLv3+
 Url:     https://www.riverbankcomputing.com/software/pyqt/
 Url:     https://www.riverbankcomputing.com/software/pyqt/
-Source0: https://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5_gpl-%{version}.tar.gz
+Source0: PyQt5-%{version}.tar.gz
 Source1: macros.pyqt5
 Source1: macros.pyqt5
 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
 Source2: pylupdate5.sh
 Source2: pylupdate5.sh
@@ -66,9 +65,6 @@ Source4: pyuic5.sh
 ## upstreamable patches
 ## upstreamable patches
 Patch0: python-qt5_sipdir.patch
 Patch0: python-qt5_sipdir.patch
 
 
-Patch1000: python-qt5-sip-option.patch
-Patch1001: pyqt5-5.12.3-python2.patch
-
 BuildRequires: chrpath
 BuildRequires: chrpath
 BuildRequires: findutils
 BuildRequires: findutils
 BuildRequires: qt5-rpm-macros
 BuildRequires: qt5-rpm-macros
@@ -139,9 +135,11 @@ Provides: python2-qt5%{?_isa} = %{version}-%{release}
 %description
 %description
 PyQt5 is Python bindings for Qt5.
 PyQt5 is Python bindings for Qt5.
 
 
+
 %if 0%{?with_python2}
 %if 0%{?with_python2}
 %package base
 %package base
 Summary: Python bindings for Qt5 base
 Summary: Python bindings for Qt5 base
+Group: programming
 Requires: %{name}-rpm-macros = %{version}-%{release}
 Requires: %{name}-rpm-macros = %{version}-%{release}
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_sip_api:Requires: python-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 %{?_sip_api:Requires: python-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
@@ -153,8 +151,10 @@ Provides: python-PyQt5-base%{?_isa} = %{version}-%{release}
 %description base
 %description base
 %{summary}.
 %{summary}.
 
 
+
 %package devel
 %package devel
 Summary: Development files for %{name}
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel
 Requires: qt5-qtbase-devel
 Requires: sip-devel
 Requires: sip-devel
@@ -165,8 +165,10 @@ Files needed to build other bindings for C++ classes that inherit from any
 of the Qt5 classes (e.g. KDE or your own).
 of the Qt5 classes (e.g. KDE or your own).
 %endif
 %endif
 
 
+
 %package rpm-macros
 %package rpm-macros
 Summary: RPM macros %{name}
 Summary: RPM macros %{name}
+Group: programming
 # when split out
 # when split out
 Conflicts: python-qt5 < 5.6
 Conflicts: python-qt5 < 5.6
 Conflicts: python3-qt5 < 5.6
 Conflicts: python3-qt5 < 5.6
@@ -174,8 +176,10 @@ BuildArch: noarch
 %description rpm-macros
 %description rpm-macros
 %{summary}.
 %{summary}.
 
 
+
 %package -n python3-qt5
 %package -n python3-qt5
 Summary: Python 3 bindings for Qt5
 Summary: Python 3 bindings for Qt5
+Group: programming
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 # when split out
 # when split out
@@ -190,8 +194,10 @@ Requires: dbus-python3
 %description -n python3-qt5
 %description -n python3-qt5
 %{summary}.
 %{summary}.
 
 
+
 %package -n python3-qt5-base
 %package -n python3-qt5-base
 Summary: Python 3 bindings for Qt5 base
 Summary: Python 3 bindings for Qt5 base
+Group: programming
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
 Provides: python3-PyQt5-base = %{version}-%{release}
 Provides: python3-PyQt5-base = %{version}-%{release}
@@ -202,8 +208,10 @@ Requires: dbus-python3
 %description -n python3-qt5-base
 %description -n python3-qt5-base
 %{summary}.
 %{summary}.
 
 
+
 %package -n python3-qt5-devel
 %package -n python3-qt5-devel
 Summary: Python 3 bindings for Qt5
 Summary: Python 3 bindings for Qt5
+Group: programming
 Requires: python3-qt5%{?_isa} = %{version}-%{release}
 Requires: python3-qt5%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel
 Requires: qt5-qtbase-devel
 Requires: python3-sip-devel
 Requires: python3-sip-devel
@@ -214,14 +222,17 @@ of the Qt5 classes
 
 
 %package doc
 %package doc
 Summary: Developer documentation for %{name} 
 Summary: Developer documentation for %{name} 
-Provides: PyQt5-doc = %{version}-%{release}
+Group: documentation
 BuildArch: noarch
 BuildArch: noarch
+Provides: PyQt5-doc = %{version}-%{release}
 %description doc
 %description doc
 %{summary}.
 %{summary}.
 
 
+
 %if 0%{?webengine}
 %if 0%{?webengine}
 %package webengine
 %package webengine
 Summary: Python bindings for Qt5 WebEngine
 Summary: Python bindings for Qt5 WebEngine
+Group: programming
 BuildRequires: pkgconfig(Qt5WebEngine)
 BuildRequires: pkgconfig(Qt5WebEngine)
 BuildRequires: qt5-qtwebengine-devel
 BuildRequires: qt5-qtwebengine-devel
 Obsoletes: python-qt5 < 5.5.1-10
 Obsoletes: python-qt5 < 5.5.1-10
@@ -230,15 +241,18 @@ Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 
 %package -n python3-qt5-webengine
 %package -n python3-qt5-webengine
 Summary: Python bindings for Qt5 WebEngine
 Summary: Python bindings for Qt5 WebEngine
+Group: programming
 Obsoletes: python3-webengine < 5.5.1-13
 Obsoletes: python3-webengine < 5.5.1-13
 Obsoletes: python3-qt5 < 5.5.1-10
 Obsoletes: python3-qt5 < 5.5.1-10
 Requires:  python3-qt5%{?_isa} = %{version}-%{release}
 Requires:  python3-qt5%{?_isa} = %{version}-%{release}
 %description -n python3-qt5-webengine
 %description -n python3-qt5-webengine
 %endif
 %endif
 
 
+
 %if 0%{?webkit}
 %if 0%{?webkit}
 %package webkit
 %package webkit
 Summary: Python bindings for Qt5 Webkit
 Summary: Python bindings for Qt5 Webkit
+Group: programming
 BuildRequires: pkgconfig(Qt5WebKit) pkgconfig(Qt5WebKitWidgets)
 BuildRequires: pkgconfig(Qt5WebKit) pkgconfig(Qt5WebKitWidgets)
 Obsoletes: python3-webkit < 5.5.1-12
 Obsoletes: python3-webkit < 5.5.1-12
 Obsoletes: python-qt5 < 5.5.1-10
 Obsoletes: python-qt5 < 5.5.1-10
@@ -247,18 +261,20 @@ Requires:  %{name}%{?_isa} = %{version}-%{release}
 
 
 %package -n python3-qt5-webkit
 %package -n python3-qt5-webkit
 Summary: Python bindings for Qt5 Webkit
 Summary: Python bindings for Qt5 Webkit
+Group: programming
 Obsoletes: python3-qt5 < 5.5.1-10
 Obsoletes: python3-qt5 < 5.5.1-10
 Requires:  python3-qt5%{?_isa} = %{version}-%{release}
 Requires:  python3-qt5%{?_isa} = %{version}-%{release}
 %description -n python3-qt5-webkit
 %description -n python3-qt5-webkit
 %endif
 %endif
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
-%setup -q -n PyQt5_gpl-%{version}%{?snap:-snapshot-%{snap}}
+%setup -q -n PyQt5-%{version}%{?snap:-snapshot-%{snap}}
 
 
 %patch0 -p1
 %patch0 -p1
-%patch1000 -p1
-%patch1001 -p1
 
 
 
 
 %build
 %build
@@ -274,7 +290,7 @@ pushd %{_target_platform}
   --no-designer-plugin \
   --no-designer-plugin \
   --no-qml-plugin \
   --no-qml-plugin \
   --qmake=%{_qt5_qmake} \
   --qmake=%{_qt5_qmake} \
-  %{!?with_python3:--no-qsci-api}%{?with_python3:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \
+  --no-qsci-api \
   --verbose \
   --verbose \
   --dbus=/usr/include/dbus-1.0/ \
   --dbus=/usr/include/dbus-1.0/ \
   QMAKE_CFLAGS_RELEASE="%{optflags}" \
   QMAKE_CFLAGS_RELEASE="%{optflags}" \
@@ -293,7 +309,11 @@ pushd %{_target_platform}-python3
   --assume-shared \
   --assume-shared \
   --confirm-license \
   --confirm-license \
   --qmake=%{_qt5_qmake} \
   --qmake=%{_qt5_qmake} \
-  %{?with_python2:--no-qsci-api}%{!?with_python2:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \
+%ifarch x86_64
+  --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \
+%else
+  --no-qsci-api \
+%endif
   %{?py3_sip:--sip=%{_bindir}/python3-sip} \
   %{?py3_sip:--sip=%{_bindir}/python3-sip} \
   %{?py3_sipdir:--sipdir=%{py3_sipdir}} \
   %{?py3_sipdir:--sipdir=%{py3_sipdir}} \
   --verbose \
   --verbose \
@@ -378,6 +398,7 @@ sed -i \
   %{buildroot}%{_bindir}/{pyrcc5,pylupdate5,pyuic5}
   %{buildroot}%{_bindir}/{pyrcc5,pylupdate5,pyuic5}
 %endif
 %endif
 
 
+
 %if 0%{?with_python2}
 %if 0%{?with_python2}
 %files
 %files
 #{python_sitearch}/PyQt5/Enginio.so
 #{python_sitearch}/PyQt5/Enginio.so
@@ -530,6 +551,7 @@ sed -i \
 %{_datadir}/python3-sip/PyQt5/
 %{_datadir}/python3-sip/PyQt5/
 %endif # with_python3
 %endif # with_python3
 
 
+%ifarch x86_64
 %files doc
 %files doc
 #doc doc/*
 #doc doc/*
 %doc examples/
 %doc examples/
@@ -538,9 +560,13 @@ sed -i \
 %dir %{_qt5_datadir}/qsci/api/
 %dir %{_qt5_datadir}/qsci/api/
 %dir %{_qt5_datadir}/qsci/api/python/
 %dir %{_qt5_datadir}/qsci/api/python/
 %doc %{_qt5_datadir}/qsci/api/python/PyQt5.api
 %doc %{_qt5_datadir}/qsci/api/python/PyQt5.api
-
+%endif
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.15.0-4
+- new upstream release.
+- built with python-3.8.
+
 * Fri Jul 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.3-3
 * Fri Jul 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.12.3-3
 - rebuilt with qt5-5.12.8.
 - rebuilt with qt5-5.12.8.
 
 

+ 20 - 15
p/python-requests/python-requests-vl.spec

@@ -1,11 +1,14 @@
 Summary: Python HTTP for Humans
 Summary: Python HTTP for Humans
 Name: python-requests
 Name: python-requests
-Version: 2.23.0
+Version: 2.24.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
+
 License: ASLv2
 License: ASLv2
-Group: Development/Languages
 URL: https://pypi.python.org/pypi/requests
 URL: https://pypi.python.org/pypi/requests
-
 Source0: https://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz
 Source0: https://pypi.python.org/packages/source/r/requests/requests-%{version}.tar.gz
 
 
 # Explicitly use the system certificates in ca-certificates.
 # Explicitly use the system certificates in ca-certificates.
@@ -22,32 +25,27 @@ Patch2: Remove-tests-that-use-the-tarpit.patch
 # a pretty odd one so this is a niche requirement.
 # a pretty odd one so this is a niche requirement.
 Patch3: requests-2.12.4-tests_nonet.patch
 Patch3: requests-2.12.4-tests_nonet.patch
 
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1567862
-Patch4: Don-t-inject-pyopenssl-into-urllib3.patch
-
+BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python
 Requires: python
 Requires: python-urllib3
 Requires: python-urllib3
 Requires: python-chardet
 Requires: python-chardet
 Requires: python-idna
 Requires: python-idna
-BuildRequires: python-devel
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
+BuildRequires: python3-rpm-macros
+BuildRequires: python-devel
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
-BuildArch: noarch
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
 
 
 %description
 %description
 Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.
 Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.
 
 
+
 %package -n python3-requests
 %package -n python3-requests
 Summary: Python HTTP for Humans
 Summary: Python HTTP for Humans
-Group: Development/Languages
+Group: programming
 Requires: python3
 Requires: python3
 Requires: python3-urllib3
 Requires: python3-urllib3
 Requires: python3-chardet
 Requires: python3-chardet
@@ -56,6 +54,7 @@ Requires: python3-idna
 %description -n python3-requests
 %description -n python3-requests
 Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.
 Requests is an Apache2 Licensed HTTP library, written in Python, for human beings.
 
 
+
 %prep
 %prep
 %autosetup -p1 -n requests-%{version}
 %autosetup -p1 -n requests-%{version}
 
 
@@ -65,15 +64,18 @@ rm -rf requests/cacert.pem
 # env shebang in nonexecutable file
 # env shebang in nonexecutable file
 sed -i '/#!\/usr\/.*python/d' requests/certs.py
 sed -i '/#!\/usr\/.*python/d' requests/certs.py
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/requests-%{version}-py*.egg-info
 %{python3_sitelib}/requests-%{version}-py*.egg-info
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.24.0-1
+- new upstream release.
+
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.23.0-1
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.23.0-1
 - new upstream release.
 - new upstream release.
 - updated patches.
 - updated patches.

+ 26 - 72
p/python-setuptools/python-setuptools-vl.spec

@@ -1,23 +1,21 @@
-%bcond_with bootstrap
+%bcond_without bootstrap
 %bcond_without python3
 %bcond_without python3
 
 
 %global srcname setuptools
 %global srcname setuptools
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
 
 
 %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
 %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
-%global python2_wheelname %python_wheelname
-%global python2_record %{python_sitelib}/%{srcname}-%{version}.dist-info/RECORD
 %if %{with python3}
 %if %{with python3}
 %global python3_wheelname %python_wheelname
 %global python3_wheelname %python_wheelname
 %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD
 %global python3_record %{python3_sitelib}/%{srcname}-%{version}.dist-info/RECORD
 %endif
 %endif
 
 
 Name:           python-setuptools
 Name:           python-setuptools
-Version:        44.1.0
+Version:        49.6.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 Summary(ja):     Python パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
 Summary(ja):     Python パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
-Group:          Development/Tools
+Group:          programming
 License:        PSFL/ZPL
 License:        PSFL/ZPL
 URL:            https://pypi.python.org/pypi/setuptools
 URL:            https://pypi.python.org/pypi/setuptools
 Source0:        https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.zip
 Source0:        https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.zip
@@ -25,21 +23,17 @@ Source1:        psfl.txt
 Source2:        zpl.txt
 Source2:        zpl.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
-Requires(post): alternatives
 BuildArch:      noarch
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
 %if %{with python3}
 %if %{with python3}
+BuildRequires:  python3
+BuildRequires:  python3-devel
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
-%endif
 %if %{without bootstrap}
 %if %{without bootstrap}
-BuildRequires:  python-pip
-BuildRequires:  python-wheel
-%if %{with python3}
 BuildRequires:  python3-pip
 BuildRequires:  python3-pip
 BuildRequires:  python3-wheel
 BuildRequires:  python3-wheel
-%endif
 %endif # without bootstrap
 %endif # without bootstrap
+%endif # with python3
 
 
 %description
 %description
 setuptools is a collection of enhancements to the Python distutils that allow
 setuptools is a collection of enhancements to the Python distutils that allow
@@ -52,15 +46,13 @@ setuptools は Python distutils の拡張機能を集めたツールです。
 なります。特に他のパッケージに依存しているパッケージを扱う際に便利
 なります。特に他のパッケージに依存しているパッケージを扱う際に便利
 です。
 です。
 
 
-%if %{with python3}
 
 
-%package -n python3-setuptools
+%if %{with python3}
+%package -n     python3-setuptools
 Summary:        Download, build, install, upgrade, and uninstall Python3 packages
 Summary:        Download, build, install, upgrade, and uninstall Python3 packages
-Summary(ja):     Python3 パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
-Group:          Development/Tools
-
-BuildRequires:  python3-devel
-Requires(post): alternatives
+Summary(ja):    Python3 パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
+Group:          programming
+Requires(post,postun): alternatives
 
 
 %description -n python3-setuptools
 %description -n python3-setuptools
 setuptools is a collection of enhancements to the Python distutils that allow
 setuptools is a collection of enhancements to the Python distutils that allow
@@ -72,9 +64,9 @@ setuptools は Python distutils の拡張機能を集めたツールです。
 このツールにより Python パッケージの構築や配布が簡単に行えるように
 このツールにより Python パッケージの構築や配布が簡単に行えるように
 なります。特に他のパッケージに依存しているパッケージを扱う際に便利
 なります。特に他のパッケージに依存しているパッケージを扱う際に便利
 です。
 です。
-
 %endif
 %endif
 
 
+
 %prep
 %prep
 %setup -q -n %{srcname}-%{version}
 %setup -q -n %{srcname}-%{version}
 
 
@@ -98,12 +90,6 @@ rm -f setuptools/*.exe
 rm setuptools/tests/test_integration.py
 rm setuptools/tests/test_integration.py
 
 
 %build
 %build
-%if %{without bootstrap}
-%py_build_wheel
-%else
-%py_build
-%endif
-
 %if %{with python3}
 %if %{with python3}
 %if %{without bootstrap}
 %if %{without bootstrap}
 %py3_build_wheel
 %py3_build_wheel
@@ -139,83 +125,51 @@ sed -i '/^setuptools\/tests\//d' %{buildroot}%{python3_record}
 find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f
 find %{buildroot}%{python3_sitelib} -name '*.exe' | xargs rm -f
 %endif # with python3
 %endif # with python3
 
 
-
-%if %{without bootstrap}
-%py_install_wheel %{python2_wheelname}
-%else
-%py_install
-%endif
-
-rm -rf %{buildroot}%{python_sitelib}/setuptools/tests
-%if %{without bootstrap}
-sed -i '/^setuptools\/tests\//d' %{buildroot}%{python2_record}
-%endif
-
-find %{buildroot}%{python_sitelib} -name '*.exe' | xargs rm -f
-
 # Don't ship these
 # Don't ship these
 rm -r docs/{Makefile,conf.py,_*}
 rm -r docs/{Makefile,conf.py,_*}
-rm %{buildroot}%{_bindir}/easy_install
+
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-if [ ! -L %{_bindir}/easy_install ]; then
-  rm -f %{_bindir}/easy_install
-fi
-
-%post
-update-alternatives --install %{_bindir}/easy_install easy_install \
-	                      %{_bindir}/easy_install-%{python_version} 30
-
-%triggerpostun -- python-setuptools < 5.4.2-2
-update-alternatives --auto easy_install
-
-%preun
-if [ "$1" = "0" ]
-then
-  update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version}
-fi
 
 
 %if %{with python3}
 %if %{with python3}
-
 %pre -n python3-setuptools
 %pre -n python3-setuptools
 if [ ! -L %{_bindir}/easy_install ]; then
 if [ ! -L %{_bindir}/easy_install ]; then
   rm -f %{_bindir}/easy_install
   rm -f %{_bindir}/easy_install
 fi
 fi
 
 
 %post -n python3-setuptools
 %post -n python3-setuptools
-update-alternatives --install %{_bindir}/easy_install easy_install \
-	                      %{_bindir}/easy_install-%{python3_version} 20
+/sbin/update-alternatives \
+  --install %{_bindir}/easy_install easy_install \
+  %{_bindir}/easy_install-%{python3_version} %{python3_version_nodots}
 
 
 %preun -n python3-setuptools
 %preun -n python3-setuptools
-if [ "$1" = "0" ]
-then
-  update-alternatives --remove easy_install %{_bindir}/easy_install-%{python3_version}
+if [ "$1" = "0" ]; then
+  /sbin/update-alternatives \
+    --remove easy_install %{_bindir}/easy_install-%{python3_version}
 fi
 fi
-
 %endif
 %endif
 
 
-%files
-%defattr(-,root,root,-)
-%license LICENSE
-%doc docs/* CHANGES.rst README.rst
-%{python_sitelib}/*
-%{_bindir}/easy_install-2*
-
 %if %{with python3}
 %if %{with python3}
 %files -n python3-setuptools
 %files -n python3-setuptools
 %license LICENSE
 %license LICENSE
 %doc docs/* CHANGES.rst README.rst
 %doc docs/* CHANGES.rst README.rst
 %{python3_sitelib}/easy_install.py
 %{python3_sitelib}/easy_install.py
+%{python3_sitelib}/distutils-precedence.pth
 %{python3_sitelib}/pkg_resources/
 %{python3_sitelib}/pkg_resources/
 %{python3_sitelib}/setuptools*/
 %{python3_sitelib}/setuptools*/
 %{python3_sitelib}/__pycache__/*
 %{python3_sitelib}/__pycache__/*
+%{python3_sitelib}/_distutils_hack
 %{_bindir}/easy_install-3*
 %{_bindir}/easy_install-3*
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 49.6.0-1
+- updated to 49.6.0.
+- built with python3 only.
+
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.0-1
 * Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.0-1
 - updated to 44.1.0 (last release for Python2).
 - updated to 44.1.0 (last release for Python2).
 
 

+ 14 - 7
p/python-six/python-six-vl.spec

@@ -2,10 +2,10 @@
 
 
 # Basic Information
 # Basic Information
 Name:		python-six
 Name:		python-six
-Version:	1.14.0
+Version:	1.15.0
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
 # /usr/share/doc/rpm-4.11.2/GROUPS_for_vine.txt を参照して Group を修正してください。
 # /usr/share/doc/rpm-4.11.2/GROUPS_for_vine.txt を参照して Group を修正してください。
-Group:		Development/Libraries
+Group:		programming
 Vendor:		Project Vine
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Distribution:	Vine Linux
 Packager:	yasumichi
 Packager:	yasumichi
@@ -24,6 +24,7 @@ Requires:	python
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
@@ -45,10 +46,11 @@ found there.
 For questions about six or porting in general, email the python-porting mailing
 For questions about six or porting in general, email the python-porting mailing
 list: http://mail.python.org/mailman/listinfo/python-porting
 list: http://mail.python.org/mailman/listinfo/python-porting
 
 
-%package -n python3-six
-Summary:		Python 2 and 3 compatibility utilities
+%package -n	python3-six
+Summary:	Python 2 and 3 compatibility utilities
 Summary(ja):	Python 2 および 3 の互換ユーテリティ
 Summary(ja):	Python 2 および 3 の互換ユーテリティ
-Requires:		python3
+Group:		programming
+Requires:	python3
 
 
 %description -n python3-six
 %description -n python3-six
 for smoothing over the differences between the Python versions with the goal of
 for smoothing over the differences between the Python versions with the goal of
@@ -71,14 +73,15 @@ list: http://mail.python.org/mailman/listinfo/python-porting
 %prep
 %prep
 %setup -q -n six-%{version}
 %setup -q -n six-%{version}
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
 
 
 %install
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__rm} -rf ${RPM_BUILD_ROOT}
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
 
 
@@ -101,7 +104,11 @@ list: http://mail.python.org/mailman/listinfo/python-porting
 %{python3_sitelib}/six.py*
 %{python3_sitelib}/six.py*
 %{python3_sitelib}/__pycache__/six.*
 %{python3_sitelib}/__pycache__/six.*
 
 
+
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.0-1
+- new upstream release.
+
 * Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.0-1
 * Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 19 - 13
p/python-snowballstemmer/python-snowballstemmer-vl.spec

@@ -1,21 +1,23 @@
 %global pypi_name snowballstemmer
 %global pypi_name snowballstemmer
 
 
-Name:           python-%{pypi_name}
-Version:        1.2.1
-Release:        8%{?_dist_release}
 Summary:        Provides 16 stemmer algorithms generated from Snowball algorithms
 Summary:        Provides 16 stemmer algorithms generated from Snowball algorithms
-
-License:        BSD
-URL:            https://pypi.python.org/pypi/%{pypi_name}
-
+Name:           python-%{pypi_name}
+Version:        2.0.0
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
-Source0:        https://pypi.python.org/packages/20/6b/d2a7cb176d4d664d94a6debf52cd8dbae1f7203c8e42426daa077051d59c/%{pypi_name}-%{version}.tar.gz
+License:        BSD
+URL:            https://pypi.python.org/pypi/%{pypi_name}
+Source0:       %{pypi_name}-%{version}.tar.gz
 
 
 BuildArch:      noarch
 BuildArch:      noarch
-BuildRequires:  python-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+
+BuildRequires:  python-devel
+BuildRequires:  python2-rpm-macros
+
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
 
 
@@ -46,6 +48,7 @@ uses it to accelerate.
 
 
 %package -n     python3-%{pypi_name}
 %package -n     python3-%{pypi_name}
 Summary:        Provides 16 stemmer algorithms generated from Snowball algorithms
 Summary:        Provides 16 stemmer algorithms generated from Snowball algorithms
+Group:          programming
 BuildArch:      noarch
 BuildArch:      noarch
 %{?python_provide:%python_provide python3-%{pypi_name}}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
 
@@ -79,12 +82,12 @@ rm -rf %{pypi_name}.egg-info
 
 
 
 
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
 
 
 %install
 %install
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
 
 
@@ -93,19 +96,22 @@ rm -rf %{pypi_name}.egg-info
 
 
 
 
 %files
 %files
-%license LICENSE.rst
+%license COPYING
 %doc README.rst
 %doc README.rst
 %{python_sitelib}/%{pypi_name}-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/%{pypi_name}-%{version}-py%{python_version}.egg-info
 %{python_sitelib}/%{pypi_name}/
 %{python_sitelib}/%{pypi_name}/
 
 
 %files -n python3-%{pypi_name}
 %files -n python3-%{pypi_name}
-%license LICENSE.rst
+%license COPYING
 %doc README.rst
 %doc README.rst
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
 %{python3_sitelib}/%{pypi_name}/
 %{python3_sitelib}/%{pypi_name}/
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.0.0-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.1-8
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.1-8
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 16 - 11
p/python-sphinx-theme-alabaster/python-sphinx-theme-alabaster-vl.spec

@@ -1,23 +1,24 @@
 %global pypi_name alabaster
 %global pypi_name alabaster
 %global srcname sphinx-theme-%{pypi_name}
 %global srcname sphinx-theme-%{pypi_name}
 
 
+Summary:        Configurable sidebar-enabled Sphinx theme
 Name:           python-%{srcname}
 Name:           python-%{srcname}
 Version:        0.7.12
 Version:        0.7.12
-Release:        3%{?_dist_release}
-Summary:        Configurable sidebar-enabled Sphinx theme
-
-License:        BSD
-URL:            https://pypi.python.org/pypi/%{pypi_name}
-
+Release:        4%{?_dist_release}
+Group:          publishing
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        BSD
+URL:            https://pypi.python.org/pypi/%{pypi_name}
 Source0:        https://files.pythonhosted.org/packages/cc/b4/ed8dcb0d67d5cfb7f83c4d5463a7614cb1d078ad7ae890c9143edebbf072/alabaster-0.7.12.tar.gz
 Source0:        https://files.pythonhosted.org/packages/cc/b4/ed8dcb0d67d5cfb7f83c4d5463a7614cb1d078ad7ae890c9143edebbf072/alabaster-0.7.12.tar.gz
 
 
 BuildArch:      noarch
 BuildArch:      noarch
+BuildRequires:  python-rpm-macros
+
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
-BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 
 
 %{?python_provide:%python_provide python2-%{srcname}}
 %{?python_provide:%python_provide python2-%{srcname}}
 
 
@@ -29,6 +30,7 @@ theme used for Flask & related projects.
 
 
 %package -n     python3-%{srcname}
 %package -n     python3-%{srcname}
 Summary:        Configurable sidebar-enabled Sphinx theme
 Summary:        Configurable sidebar-enabled Sphinx theme
+Group:          publishing
 BuildArch:      noarch
 BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools
@@ -49,20 +51,20 @@ rm -rf %{pypi_name}.egg-info
 
 
 
 
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
 
 
 %install
 %install
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
 
 
 %files
 %files
 %license LICENSE
 %license LICENSE
 %doc README.rst
 %doc README.rst
-%{python_sitelib}/%{pypi_name}-%{version}-py%{python_version}.egg-info/
-%{python_sitelib}/%{pypi_name}/
+%{python2_sitelib}/%{pypi_name}-%{version}-py%{python_version}.egg-info/
+%{python2_sitelib}/%{pypi_name}/
 
 
 %files -n python%{python3_pkgversion}-%{srcname}
 %files -n python%{python3_pkgversion}-%{srcname}
 %license LICENSE
 %license LICENSE
@@ -72,6 +74,9 @@ rm -rf %{pypi_name}.egg-info
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.7.12-4
+- rebuilt with python-3.8.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.7.12-3
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.7.12-3
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 64 - 165
p/python-sphinx/python-sphinx-vl.spec

@@ -1,13 +1,15 @@
-%global upstream_name Sphinx
+%bcond_with bootstrap
 
 
+%global upstream_name Sphinx
 %global py3_default 0
 %global py3_default 0
 
 
-Name:       python-sphinx
-Version:    1.7.9
-Release:    2%{?_dist_release}
-Summary:    Python documentation generator
-
-Group:      Development/Tools
+Summary:        Python documentation generator
+Name:           python-sphinx
+Version:        3.2.1
+Release:        1%{?_dist_release}
+Group:          publishing,programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
 # Unless otherwise noted, the license for code is BSD
 # Unless otherwise noted, the license for code is BSD
 # sphinx/util/stemmer.py Public Domain
 # sphinx/util/stemmer.py Public Domain
@@ -15,60 +17,16 @@ Group:      Development/Tools
 # jquery (MIT or GPLv2)
 # jquery (MIT or GPLv2)
 License: BSD and Public Domain and Python and (MIT or GPLv2)
 License: BSD and Public Domain and Python and (MIT or GPLv2)
 URL:        http://sphinx.pocoo.org/
 URL:        http://sphinx.pocoo.org/
-Vendor:     Project Vine
-Distribution: Vine Linux
-
-Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
-Source1:    python2-sphinx
-Source2:    python3-sphinx
-Source3:    zz-modules-python-sphinx.sh
-Source4:    zz-modules-python-sphinx.csh
-Source5:    README.fedora
-# environment-modules file to select whether the py2 or py3 version of
-# python-sphinx execuitables is default
-Source6:    default-sphinx-command.in
-
-# Make the test_latex_remote_images an expected failure
-# since it requires an active internet connection
-# to fetch images, which is not possible in koji or mock.
-Patch0: xfail-test_latex_remote_images.patch
+
+Source0:    https://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
 
 
 # Allow extra themes to exist. We pull in python[23]-sphinx-theme-alabaster
 # Allow extra themes to exist. We pull in python[23]-sphinx-theme-alabaster
 # which causes that test to fail.
 # which causes that test to fail.
 Patch1: sphinx-test_theming.diff
 Patch1: sphinx-test_theming.diff
 
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:     noarch
 BuildArch:     noarch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-
-BuildRequires: python-six
-BuildRequires: python-jinja2
-BuildRequires: python-pygments
-BuildRequires: python-docutils
-BuildRequires: python-snowballstemmer
-BuildRequires: python-babel
-BuildRequires: python-sphinx-theme-alabaster
-BuildRequires: python-imagesize
-BuildRequires: python-requests
-BuildRequires: python-packaging
-BuildRequires: python-typing
-BuildRequires: python-sphinxcontrib-websupport
-
-Requires:      python-sphinx-locale = %{version}-%{release}
-Requires:      python-six
-Requires:      python-jinja2
-Requires:      python-pygments
-Requires:      python-docutils
-Requires:      python-snowballstemmer
-Requires:      python-babel
-Requires:      python-sphinx-theme-alabaster
-Requires:      python-imagesize
-Requires:      python-requests
-Requires:      python-packaging
-Requires:      python-typing
-Requires:      python-sphinxcontrib-websupport
 
 
 %description
 %description
 Sphinx is a tool that makes it easy to create intelligent and
 Sphinx is a tool that makes it easy to create intelligent and
@@ -101,7 +59,7 @@ the Python docs:
 
 
 %package -n python3-sphinx
 %package -n python3-sphinx
 Summary:       Python documentation generator
 Summary:       Python documentation generator
-Group:         Development/Tools
+Group:         publishing,programming
 
 
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-devel
 BuildRequires: python3-devel
@@ -109,7 +67,6 @@ BuildRequires: python3-setuptools
 
 
 BuildRequires: python3-six
 BuildRequires: python3-six
 BuildRequires: python3-jinja2
 BuildRequires: python3-jinja2
-BuildRequires: python3-pygments
 BuildRequires: python3-docutils
 BuildRequires: python3-docutils
 BuildRequires: python3-snowballstemmer
 BuildRequires: python3-snowballstemmer
 BuildRequires: python3-babel
 BuildRequires: python3-babel
@@ -117,12 +74,11 @@ BuildRequires: python3-sphinx-theme-alabaster
 BuildRequires: python3-imagesize
 BuildRequires: python3-imagesize
 BuildRequires: python3-requests
 BuildRequires: python3-requests
 BuildRequires: python3-packaging
 BuildRequires: python3-packaging
-BuildRequires: python3-sphinxcontrib-websupport
 
 
+Requires:      python3-setuptools
 Requires:      python-sphinx-locale = %{version}-%{release}
 Requires:      python-sphinx-locale = %{version}-%{release}
 Requires:      python3-six
 Requires:      python3-six
 Requires:      python3-jinja2
 Requires:      python3-jinja2
-Requires:      python3-pygments
 Requires:      python3-docutils
 Requires:      python3-docutils
 Requires:      python3-snowballstemmer
 Requires:      python3-snowballstemmer
 Requires:      python3-babel
 Requires:      python3-babel
@@ -130,7 +86,23 @@ Requires:      python3-sphinx-theme-alabaster
 Requires:      python3-imagesize
 Requires:      python3-imagesize
 Requires:      python3-requests
 Requires:      python3-requests
 Requires:      python3-packaging
 Requires:      python3-packaging
+
+%if !%{with bootstrap}
+BuildRequires: python3-pygments
+BuildRequires: python3-sphinxcontrib-websupport
+BuildRequires: python3-sphinxcontrib-serializinghtml
+BuildRequires: python3-sphinxcontrib-applehelp
+BuildRequires: python3-sphinxcontrib-devhelp
+BuildRequires: python3-sphinxcontrib-htmlhelp
+BuildRequires: python3-sphinxcontrib-qthelp
+Requires:      python3-pygments
 Requires:      python3-sphinxcontrib-websupport
 Requires:      python3-sphinxcontrib-websupport
+Requires:      python3-sphinxcontrib-serializinghtml
+Requires:      python3-sphinxcontrib-applehelp
+Requires:      python3-sphinxcontrib-devhelp
+Requires:      python3-sphinxcontrib-htmlhelp
+Requires:      python3-sphinxcontrib-qthelp
+%endif
 
 
 %description -n python3-sphinx
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
 Sphinx is a tool that makes it easy to create intelligent and
@@ -161,9 +133,9 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
       snippets and inclusion of appropriately formatted docstrings.
 
 
 %package locale
 %package locale
-Summary:       Locale files for %{name}
-Group:         Development/Tools
-License:       BSD
+Summary:        Locale files for %{name}
+Group:          publishing
+License:        BSD
 
 
 %description locale
 %description locale
 Sphinx is a tool that makes it easy to create intelligent and
 Sphinx is a tool that makes it easy to create intelligent and
@@ -177,9 +149,8 @@ This package contains locale files for Sphinx
 
 
 %package doc
 %package doc
 Summary:    Documentation for %{name}
 Summary:    Documentation for %{name}
-Group:      Documentation
+Group:      documentation
 License:    BSD
 License:    BSD
-Requires:   %{name} = %{version}-%{release}
 
 
 
 
 %description doc
 %description doc
@@ -196,85 +167,57 @@ This package contains documentation in reST and HTML formats.
 %prep
 %prep
 %autosetup -n %{upstream_name}-%{version} -p1
 %autosetup -n %{upstream_name}-%{version} -p1
 
 
-cp %{SOURCE5} .
-
 # fix line encoding of bundled jquery.js
 # fix line encoding of bundled jquery.js
 perl -pi -e 's/\r//' ./sphinx/themes/basic/static/jquery.js
 perl -pi -e 's/\r//' ./sphinx/themes/basic/static/jquery.js
 
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif # with_python3
 
 
 %build
 %build
-%{py_build}
-%{py3_build}
+%py3_build
 
 
+%if !%{with bootstrap}
 export PYTHONPATH=$PWD
 export PYTHONPATH=$PWD
 pushd doc
 pushd doc
 export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
 export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
-
 make html SPHINXBUILD="$SPHINXBUILD"
 make html SPHINXBUILD="$SPHINXBUILD"
 make man SPHINXBUILD="$SPHINXBUILD"
 make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
 rm -rf _build/html/.buildinfo
 mv _build/html ..
 mv _build/html ..
 popd
 popd
-
+%endif
 
 
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
+%py3_install
 
 
-%{py3_install}
-install -d %{buildroot}%{_libexecdir}/python3-sphinx
-for i in sphinx-{apidoc,autogen,build,quickstart}; do
-    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
-    ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
-    ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
-done
-
-%{py_install}
-install -d %{buildroot}%{_libexecdir}/python2-sphinx
-install -d %{buildroot}%{_libexecdir}/python2-sphinx
-for i in sphinx-{apidoc,autogen,build,quickstart}; do
-    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python_version}
-    ln -s $i-%{python_version} %{buildroot}%{_bindir}/$i-2
-    ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
-done
+# Clean up non-python files
+rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
+rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
 
 
+%if !%{with bootstrap}
 pushd doc
 pushd doc
 # Deliver man pages
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
 install -d %{buildroot}%{_mandir}/man1
 for f in _build/man/sphinx-*.1;
 for f in _build/man/sphinx-*.1;
 do
 do
-    ### TODO: these are all the same.  Do we really need to ship them three
-    ### times or is it fine to just ship them as e.g. sphinx-build.1
     cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
     cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
-    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python_version}.1|")
-    cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|")
 done
 done
-
-# Remove language files, they're identical to the ones from the
-# Python 2 build that will be moved to /usr/share below
-find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
 popd
 popd
-
-# Clean up non-python files
-rm -f %{buildroot}%{python_sitelib}/sphinx/locale/.DS_Store
-rm -rf %{buildroot}%{python_sitelib}/sphinx/locale/.tx
-rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
-rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
+%endif
 
 
 # Deliver rst files
 # Deliver rst files
 rm -rf doc/_build
 rm -rf doc/_build
 sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
 sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
 mv doc reST
 mv doc reST
+rm reST/make.bat
 
 
 # Move language files to /usr/share;
 # Move language files to /usr/share;
 # patch to support this incorporated in 0.6.6
 # patch to support this incorporated in 0.6.6
-pushd %{buildroot}%{python_sitelib}
+pushd %{buildroot}%{python3_sitelib}
 
 
-for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.
+*' -printf "%f "`;
 do
 do
+  test $lang == __pycache__ && continue
   install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
   install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
   install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
   install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
   mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \
   mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \
@@ -285,37 +228,9 @@ do
 done
 done
 popd
 popd
 
 
-#install -d %{buildroot}%{_modulesdir}/python-sphinx
-#install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/
-#sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx
-#install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/
-#sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx
-
-install -d %{buildroot}%{_sysconfdir}/profile.d
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
-
-%if %{py3_default}
-#sed 's/@PYTHONVER@/3/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
-
-# These symlinks establish a default for when a package is first installed (and
-# therefore, environment modules is not loaded).  The user can immediately
-# switch them by using module swap python-sphinx/python2-sphinx
-for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
-  ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
-done
-
-%else
-#sed 's/@PYTHONVER@/2/' < %{SOURCE6} > %{buildroot}%{_modulesdir}/python-sphinx/.version
-
-# These symlinks establish a default for when a package is first installed (and
-# therefore, environment modules is not loaded).  The user can immediately
-# switch them by using module swap python-sphinx/python3-sphinx
-for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
-  ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
-done
-
-%endif
+# Create the sphinxcontrib directory, so we can own it
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1669790 for rationale
+mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 
 
 %find_lang sphinx
 %find_lang sphinx
 
 
@@ -325,6 +240,7 @@ done
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.js$\):%lang(\2) \1\2\3:' \
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.js$\):%lang(\2) \1\2\3:' \
   >> sphinx.lang
   >> sphinx.lang
 
 
+
 %clean
 %clean
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
 
 
@@ -333,41 +249,17 @@ done
 #__make test
 #__make test
 
 
 
 
-%files
-%defattr(-,root,root,-)
-%license LICENSE
-%doc AUTHORS CHANGES EXAMPLES README.*
-%{_bindir}/sphinx-*-2*
-%{_bindir}/sphinx-build
-%{_bindir}/sphinx-apidoc
-%{_bindir}/sphinx-autogen
-%{_bindir}/sphinx-quickstart
-%{python_sitelib}/sphinx/
-%{python_sitelib}/Sphinx-%{version}-py%{python_version}.egg-info/
-%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
-%{_mandir}/man1/*
-%{_libexecdir}/python2-sphinx/
-#{_modulesdir}/python-sphinx/python2-sphinx
-%if !%{py3_default}
-#{_modulesdir}/python-sphinx/.version
-%endif
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
-
 %files -n python3-sphinx
 %files -n python3-sphinx
 %license LICENSE
 %license LICENSE
 %doc AUTHORS CHANGES EXAMPLES README.*
 %doc AUTHORS CHANGES EXAMPLES README.*
-%{_bindir}/sphinx-*-3*
+%{_bindir}/sphinx-*
 %{python3_sitelib}/sphinx/
 %{python3_sitelib}/sphinx/
 %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
 %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
-%{_mandir}/man1/sphinx-*-%{python3_version}.1*
-%{_libexecdir}/python3-sphinx/
-#{_modulesdir}/python-sphinx/python3-sphinx
-%if %{py3_default}
-#{_modulesdir}/python-sphinx/.version
+%dir %{python3_sitelib}/sphinxcontrib/
+%dir %{_datadir}/sphinx/
+%if !%{with bootstrap}
+%{_mandir}/man1/sphinx-*
 %endif
 %endif
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 
 %files locale -f sphinx.lang
 %files locale -f sphinx.lang
 %license LICENSE
 %license LICENSE
@@ -377,10 +269,17 @@ done
 
 
 %files doc
 %files doc
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
+%license LICENSE
+%if !%{with bootstrap}
 %doc html reST
 %doc html reST
+%endif
 
 
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.1-1
+- new upstream release.
+- built with python3 only.
+
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.9-2
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.9-2
 - fixed R:.
 - fixed R:.
 
 

+ 119 - 0
p/python-sphinxcontrib-applehelp/python-sphinxcontrib-applehelp-vl.spec

@@ -0,0 +1,119 @@
+%global pypi_name sphinxcontrib-applehelp
+
+# when bootstrapping sphinx, we cannot run tests yet
+%bcond_with check
+
+Summary:        Sphinx extension for Apple help books
+Name:           python-%{pypi_name}
+Version:        1.0.2
+Release:        3%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://sphinx-doc.org/
+Source0:        %{pypi_source}
+
+BuildArch:      noarch
+BuildRequires:  gettext
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx >= 1:2
+%endif
+
+%description
+sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books.
+
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+Group:          programming
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+find -name '*.mo' -delete
+
+
+%build
+for po in $(find -name '*.po'); do
+  msgfmt --output-file=${po%.po}.mo ${po}
+done
+%py3_build
+
+
+%install
+%py3_install
+
+# Move language files to /usr/share
+pushd %{buildroot}%{python3_sitelib}
+for lang in `find sphinxcontrib/applehelp/locales -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+do
+  test $lang == __pycache__ && continue
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinxcontrib/applehelp/locales/$lang/LC_MESSAGES/*.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+done
+rm -rf sphinxcontrib/applehelp/locales
+ln -s %{_datadir}/locale sphinxcontrib/applehelp/locales
+popd
+
+
+%find_lang sphinxcontrib.applehelp
+
+
+%if %{with check}
+%check
+%pytest
+%endif
+
+
+%files -n python3-%{pypi_name} -f sphinxcontrib.applehelp.lang
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_applehelp-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_applehelp-%{version}-py%{python3_version}.egg-info/
+
+
+%changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.2-3
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.0.2-1
+- Update to 1.0.2 (#1808632)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-1
+- Initial package

+ 118 - 0
p/python-sphinxcontrib-devhelp/python-sphinxcontrib-devhelp-vl.spec

@@ -0,0 +1,118 @@
+%global pypi_name sphinxcontrib-devhelp
+
+# when bootstrapping sphinx, we cannot run tests yet
+%bcond_with check
+
+Summary:        Sphinx extension for Devhelp documents
+Name:           python-%{pypi_name}
+Version:        1.0.2
+Release:        3%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://sphinx-doc.org/
+Source0:        %{pypi_source}
+
+BuildArch:      noarch
+BuildRequires:  gettext
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx >= 1:2
+%endif
+
+%description
+sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document.
+
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+Group:          programming
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+find -name '*.mo' -delete
+
+
+%build
+for po in $(find -name '*.po'); do
+  msgfmt --output-file=${po%.po}.mo ${po}
+done
+%py3_build
+
+
+%install
+%py3_install
+
+# Move language files to /usr/share
+pushd %{buildroot}%{python3_sitelib}
+for lang in `find sphinxcontrib/devhelp/locales -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+do
+  test $lang == __pycache__ && continue
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinxcontrib/devhelp/locales/$lang/LC_MESSAGES/*.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+done
+rm -rf sphinxcontrib/devhelp/locales
+ln -s %{_datadir}/locale sphinxcontrib/devhelp/locales
+popd
+
+
+%find_lang sphinxcontrib.devhelp
+
+
+%if %{with check}
+%check
+%pytest
+%endif
+
+
+%files -n python3-%{pypi_name} -f sphinxcontrib.devhelp.lang
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_devhelp-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_devhelp-%{version}-py%{python3_version}.egg-info/
+
+
+%changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.2-3
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.0.2-1
+- Update to 1.0.2 (#1808639)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-1
+- Initial package

+ 119 - 0
p/python-sphinxcontrib-htmlhelp/python-sphinxcontrib-htmlhelp-vl.spec

@@ -0,0 +1,119 @@
+%global pypi_name sphinxcontrib-htmlhelp
+
+# when bootstrapping sphinx, we cannot run tests yet
+%bcond_with check
+
+Summary:        Sphinx extension for HTML help files
+Name:           python-%{pypi_name}
+Version:        1.0.3
+Release:        3%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://sphinx-doc.org/
+Source0:        %{pypi_source}
+
+BuildArch:      noarch
+BuildRequires:  gettext
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx >= 1:2
+BuildRequires:  python3-html5lib
+%endif
+
+%description
+sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files.
+
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+Group:          programming
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+find -name '*.mo' -delete
+
+
+%build
+for po in $(find -name '*.po'); do
+  msgfmt --output-file=${po%.po}.mo ${po}
+done
+%py3_build
+
+
+%install
+%py3_install
+
+# Move language files to /usr/share
+pushd %{buildroot}%{python3_sitelib}
+for lang in `find sphinxcontrib/htmlhelp/locales -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+do
+  test $lang == __pycache__ && continue
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinxcontrib/htmlhelp/locales/$lang/LC_MESSAGES/*.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+done
+rm -rf sphinxcontrib/htmlhelp/locales
+ln -s %{_datadir}/locale sphinxcontrib/htmlhelp/locales
+popd
+
+
+%find_lang sphinxcontrib.htmlhelp
+
+
+%if %{with check}
+%check
+%{__python3} -m pytest
+%endif
+
+
+%files -n python3-%{pypi_name} -f sphinxcontrib.htmlhelp.lang
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_htmlhelp-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_htmlhelp-%{version}-py%{python3_version}.egg-info/
+
+
+%changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.3-3
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jun 04 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.0.3-1
+- Update to 1.0.3 (#1699073)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-1
+- Initial package

+ 119 - 0
p/python-sphinxcontrib-qthelp/python-sphinxcontrib-qthelp-vl.spec

@@ -0,0 +1,119 @@
+%global pypi_name sphinxcontrib-qthelp
+
+# when bootstrapping sphinx, we cannot run tests yet
+%bcond_with check
+
+Summary:        Sphinx extension for QtHelp documents
+Name:           python-%{pypi_name}
+Version:        1.0.3
+Release:        3%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://sphinx-doc.org/
+Source0:        %{pypi_source}
+
+BuildArch:      noarch
+
+BuildRequires:  gettext
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx >= 1:2
+%endif
+
+%description
+sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
+
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+Group:          programming
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+find -name '*.mo' -delete
+
+
+%build
+for po in $(find -name '*.po'); do
+  msgfmt --output-file=${po%.po}.mo ${po}
+done
+%py3_build
+
+
+%install
+%py3_install
+
+# Move language files to /usr/share
+pushd %{buildroot}%{python3_sitelib}
+for lang in `find sphinxcontrib/qthelp/locales -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+do
+  test $lang == __pycache__ && continue
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinxcontrib/qthelp/locales/$lang/LC_MESSAGES/*.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+done
+rm -rf sphinxcontrib/qthelp/locales
+ln -s %{_datadir}/locale sphinxcontrib/qthelp/locales
+popd
+
+
+%find_lang sphinxcontrib.qthelp
+
+
+%if %{with check}
+%check
+%pytest
+%endif
+
+
+%files -n python3-%{pypi_name} -f sphinxcontrib.qthelp.lang
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_qthelp-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_qthelp-%{version}-py%{python3_version}.egg-info/
+
+
+%changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.3-3
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.0.3-1
+- Update to 1.0.3 (#1808636)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-1
+- Initial package

+ 124 - 0
p/python-sphinxcontrib-serializinghtml/python-sphinxcontrib-serializinghtml-vl.spec

@@ -0,0 +1,124 @@
+%global pypi_name sphinxcontrib-serializinghtml
+
+# when bootstrapping sphinx, we cannot run tests yet
+%bcond_with check
+
+Summary:        Sphinx extension for serialized HTML
+Name:           python-%{pypi_name}
+Version:        1.1.4
+Release:        3%{?_dist_release}
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://sphinx-doc.org/
+Source0:        %{pypi_source}
+BuildArch:      noarch
+
+BuildRequires:  gettext
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%if %{with check}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-sphinx >= 1:2
+%endif
+
+%description
+sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"
+HTML files (json and pickle).
+
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+Group:          programming
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+sphinxcontrib-serializinghtml is a sphinx extension which outputs "serialized"
+HTML files (json and pickle).
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+find -name '*.mo' -delete
+
+
+%build
+for po in $(find -name '*.po'); do
+  msgfmt --output-file=${po%.po}.mo ${po}
+done
+%py3_build
+
+
+%install
+%py3_install
+
+# Move language files to /usr/share
+pushd %{buildroot}%{python3_sitelib}
+for lang in `find sphinxcontrib/serializinghtml/locales -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
+do
+  test $lang == __pycache__ && continue
+  install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
+  mv sphinxcontrib/serializinghtml/locales/$lang/LC_MESSAGES/*.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/
+done
+rm -rf sphinxcontrib/serializinghtml/locales
+ln -s %{_datadir}/locale sphinxcontrib/serializinghtml/locales
+popd
+
+
+%find_lang sphinxcontrib.serializinghtml
+
+
+%if %{with check}
+%check
+%pytest
+%endif
+
+
+%files -n python3-%{pypi_name} -f sphinxcontrib.serializinghtml.lang
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/sphinxcontrib/
+%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}-*.pth
+%{python3_sitelib}/sphinxcontrib_serializinghtml-%{version}-py%{python3_version}.egg-info/
+
+
+%changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.4-3
+- initial build for Vine Linux.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.1.4-1
+- Update to 1.1.4 (#1808637)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon May 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.3-1
+- Update to 1.1.3 (#1697444)
+
+* Mon Mar 04 2019 Miro Hrončok <mhroncok@redhat.com> - 1.1.1-1
+- Initial package.

+ 15 - 22
p/python-sphinxcontrib-websupport/python-sphinxcontrib-websupport-vl.spec

@@ -2,30 +2,22 @@
 
 
 %global pypi_name sphinxcontrib-websupport
 %global pypi_name sphinxcontrib-websupport
 
 
+Summary:        Sphinx API for Web Apps
 Name:           python-%{pypi_name}
 Name:           python-%{pypi_name}
-Version:        1.1.0
+Version:        1.2.4
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        Sphinx API for Web Apps
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
 License:        BSD
 License:        BSD
 URL:            http://sphinx-doc.org/
 URL:            http://sphinx-doc.org/
 
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
 Source0:        https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Source0:        https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+
 BuildArch:      noarch
 BuildArch:      noarch
 
 
-%{?python_provide:%python_provide python2-%{pypi_name}}
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-BuildRequires:  python-sphinx
-BuildRequires:  python-sqlalchemy
-BuildRequires:  python-whoosh
-Requires:       python-sphinx
-Requires:       python-sqlalchemy
-Requires:       python-whoosh
 
 
 %description
 %description
 sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
 sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
@@ -35,6 +27,7 @@ documentation into your Web application.
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n     python3-%{pypi_name}
 %package -n     python3-%{pypi_name}
 Summary:        %{summary}
 Summary:        %{summary}
+Group:          programming
 %{?python_provide:%python_provide python3-%{pypi_name}}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
@@ -54,29 +47,24 @@ sphinxcontrib-websupport provides a Python API to easily integrate Sphinx
 documentation into your Web application.
 documentation into your Web application.
 %endif
 %endif
 
 
+
 %prep
 %prep
 %autosetup -n %{pypi_name}-%{version}
 %autosetup -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 rm -rf %{pypi_name}.egg-info
 
 
+
 %build
 %build
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_build
 %py3_build
 %endif
 %endif
-%py_build
+
 
 
 %install
 %install
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
 %endif
 %endif
-%py_install
 
 
-%files
-%license LICENSE
-%doc README.rst
-%{python_sitelib}/sphinxcontrib/websupport
-%{python_sitelib}/sphinxcontrib_websupport-*.pth
-%{python_sitelib}/sphinxcontrib_websupport-*.egg-info
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %files -n python3-%{pypi_name}
@@ -87,7 +75,12 @@ rm -rf %{pypi_name}.egg-info
 %{python3_sitelib}/sphinxcontrib_websupport-*.egg-info
 %{python3_sitelib}/sphinxcontrib_websupport-*.egg-info
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.0-1
+- new upstream release.
+- built with python3 only.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
 - new upstream release.
 - new upstream release.
 - initial build for Vine Linux.
 - initial build for Vine Linux.

+ 19 - 12
p/python-sqlalchemy/python-sqlalchemy-vl.spec

@@ -2,23 +2,22 @@
 
 
 %global srcname SQLAlchemy
 %global srcname SQLAlchemy
 
 
+Summary:        Modular and flexible ORM library for python
 Name:           python-sqlalchemy
 Name:           python-sqlalchemy
-Version:        1.2.14
+Version:        1.3.18
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        Modular and flexible ORM library for python
-
-Group:          Development/Libraries
-License:        MIT
-URL:            http://www.sqlalchemy.org/
-
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        MIT
+URL:            http://www.sqlalchemy.org/
 Source0:        https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 Source0:        https://files.pythonhosted.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 
 
 BuildRequires:  gcc
 BuildRequires:  gcc
-
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel >= 2.7
 BuildRequires:  python-devel >= 2.7
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 
 
@@ -43,6 +42,7 @@ This package includes the python 2 version of the module.
 
 
 %package doc
 %package doc
 Summary:        Documentation for SQLAlchemy
 Summary:        Documentation for SQLAlchemy
+Group:          documentation
 BuildArch:      noarch
 BuildArch:      noarch
 
 
 %description doc
 %description doc
@@ -51,7 +51,7 @@ Documentation for SQLAlchemy
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-sqlalchemy
 %package -n python3-sqlalchemy
 Summary:        Modular and flexible ORM library for python
 Summary:        Modular and flexible ORM library for python
-Group:          Development/Libraries
+Group:          programming
 %{?python_provide:%python_provide python%{python3_pkgversion}-sqlalchemy}
 %{?python_provide:%python_provide python%{python3_pkgversion}-sqlalchemy}
 
 
 %description -n python3-sqlalchemy
 %description -n python3-sqlalchemy
@@ -71,14 +71,14 @@ This package includes the python 3 version of the module.
 %setup -n %{srcname}-%{version}
 %setup -n %{srcname}-%{version}
 
 
 %build
 %build
-%py_build
+%py2_build
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_build
 %py3_build
 %endif
 %endif
 
 
 %install
 %install
-%py_install
+%py2_install
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
@@ -87,13 +87,16 @@ This package includes the python 3 version of the module.
 # remove unnecessary scripts for building documentation
 # remove unnecessary scripts for building documentation
 rm -rf doc/build
 rm -rf doc/build
 
 
+
+%ifarch x86_64
 %files doc
 %files doc
 %doc doc examples
 %doc doc examples
+%endif
 
 
 %files
 %files
 %license LICENSE
 %license LICENSE
 %doc README.rst
 %doc README.rst
-%{python_sitearch}/*
+%{python2_sitearch}/*
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python3-sqlalchemy
 %files -n python3-sqlalchemy
@@ -102,7 +105,11 @@ rm -rf doc/build
 %{python3_sitearch}/*
 %{python3_sitearch}/*
 %endif # with_python3
 %endif # with_python3
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3.18-1
+- new upstream release.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.14-1
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.14-1
 - new upstream release.
 - new upstream release.
 - initial build for Vine Linux.
 - initial build for Vine Linux.

+ 10 - 5
p/python-urllib3/python-urllib3-vl.spec

@@ -3,17 +3,17 @@
 # When bootstrapping Python, we cannot test this yet
 # When bootstrapping Python, we cannot test this yet
 %bcond_without tests
 %bcond_without tests
 
 
+Summary:        Python HTTP library with thread-safe connection pooling and file post
 Name:           python-%{srcname}
 Name:           python-%{srcname}
-Version:        1.25.8
+Version:        1.25.10
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        Python HTTP library with thread-safe connection pooling and file post
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
 License:        MIT
 License:        MIT
 URL:            https://github.com/urllib3/urllib3
 URL:            https://github.com/urllib3/urllib3
 
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 # Unbundle ssl_match_hostname since we depend on it
 # Unbundle ssl_match_hostname since we depend on it
 Source1:        ssl_match_hostname_py3.py
 Source1:        ssl_match_hostname_py3.py
@@ -33,6 +33,7 @@ Requires:       python-pysocks
 
 
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 
 
 %description
 %description
@@ -41,6 +42,7 @@ Python HTTP module with connection pooling and file POST abilities.
 
 
 %package -n python3-%{srcname}
 %package -n python3-%{srcname}
 Summary:        Python3 HTTP library with thread-safe connection pooling and file post
 Summary:        Python3 HTTP library with thread-safe connection pooling and file post
+Group:          programming
 
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python3-rpm-macros
@@ -118,6 +120,9 @@ ln -s %{python3_sitelib}/__pycache__/six.cpython-%{python3_version_nodots}.pyc \
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.25.10-1
+- new upstream release.
+
 * Sun Mar 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.25.8-1
 * Sun Mar 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.25.8-1
 - new upstream release.
 - new upstream release.
 
 

+ 21 - 19
p/python-webcolors/python-webcolors-vl.spec

@@ -1,21 +1,24 @@
 Summary: a Python library for working with color names and color value formats defined by the HTML etc.
 Summary: a Python library for working with color names and color value formats defined by the HTML etc.
 Name: python-webcolors
 Name: python-webcolors
-Version: 1.10
+Version: 1.11.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Development/Libraries
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
+
 License: MIT License
 License: MIT License
 URL: https://pypi.python.org/pypi/webcolors
 URL: https://pypi.python.org/pypi/webcolors
 Source0: https://pypi.python.org/packages/source/w/webcolors/webcolors-%{version}.tar.gz
 Source0: https://pypi.python.org/packages/source/w/webcolors/webcolors-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
 BuildArch: noarch
-BuildRequires: python-devel
-BuildRequires: python-setuptools
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildRequires: python-rpm-macros
 BuildRequires: python-rpm-macros
-Requires: python(abi) = %pyver
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
 
 
 %description
 %description
 A library for working with color names and color value formats defined by the HTML and CSS specifications for use in documents on the Web.
 A library for working with color names and color value formats defined by the HTML and CSS specifications for use in documents on the Web.
@@ -31,9 +34,7 @@ Support is included for the following formats (RGB colorspace only; conversion t
 
 
 %package -n python3-webcolors
 %package -n python3-webcolors
 Summary: a Python library for working with color names and color value formats defined by the HTML etc.
 Summary: a Python library for working with color names and color value formats defined by the HTML etc.
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-BuildRequires: python3-rpm-macros
+Group: programming
 Requires: python3
 Requires: python3
 
 
 %description -n python3-webcolors
 %description -n python3-webcolors
@@ -51,23 +52,19 @@ Support is included for the following formats (RGB colorspace only; conversion t
 %prep
 %prep
 %setup -q -n webcolors-%{version}
 %setup -q -n webcolors-%{version}
 
 
+
 %build
 %build
-%py_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
-%py_install
 %py3_install
 %py3_install
 
 
+
 %clean
 %clean
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
 
 
-%files
-%defattr(-,root,root,-)
-%license LICENSE
-%doc README
-%{python_sitelib}/webcolors*
 
 
 %files -n python3-webcolors
 %files -n python3-webcolors
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -75,8 +72,13 @@ Support is included for the following formats (RGB colorspace only; conversion t
 %doc README
 %doc README
 %{python3_sitelib}/webcolors*
 %{python3_sitelib}/webcolors*
 %{python3_sitelib}/__pycache__/webcolors*
 %{python3_sitelib}/__pycache__/webcolors*
+
  
  
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.11.1-1
+- new upstream release.
+- dropped python2.
+
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10-1
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 93 - 22
p/python-wheel/python-wheel-vl.spec

@@ -1,4 +1,6 @@
 %bcond_with bootstrap
 %bcond_with bootstrap
+%bcond_without python2
+%bcond_without python3
 %bcond_with signatures
 %bcond_with signatures
 %bcond_without tool
 %bcond_without tool
 %bcond_with test
 %bcond_with test
@@ -6,30 +8,23 @@
 %global pypi_name wheel
 %global pypi_name wheel
 
 
 Name:           python-%{pypi_name}
 Name:           python-%{pypi_name}
-Version:        0.30.0a0
-Release:        8%{?_dist_release}
+Version:        0.35.0
+Release:        1%{?_dist_release}
 Summary:        A built-package format for Python
 Summary:        A built-package format for Python
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
-Group:          Development/Libraries
 License:        MIT
 License:        MIT
 URL:            https://bitbucket.org/pypa/wheel
 URL:            https://bitbucket.org/pypa/wheel
 Source0:        https://files.pythonhosted.org/packages/source/%(n=%{pypi_name}; echo ${n:0:1})/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 Source0:        https://files.pythonhosted.org/packages/source/%(n=%{pypi_name}; echo ${n:0:1})/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 BuildArch:      noarch
 
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
-# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
-# however it can't be packaged for Fedora as of yet since the code is not licensed,
-# and as a result wheel fails to build from source.
-# Review request of keyrings.alt: https://bugzilla.redhat.com/show_bug.cgi?id=1365794
-# Until the license issue is resolved upstream, this patch is added to revert
-# the commit from wheel, that introduced this dependency.
-# https://bitbucket.org/pypa/wheel/commits/06841295888fdb430abe12aae29da92107e7360a
-Patch0: remove-keyrings.alt-dependency.patch
+BuildRequires:  python-rpm-macros
 
 
+%if %{with python2}
 BuildRequires:  python-devel
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python2-setuptools
 %if ! %{with bootstrap}
 %if ! %{with bootstrap}
 %if %{with test}
 %if %{with test}
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest
@@ -41,6 +36,23 @@ BuildRequires:  python-keyring
 %endif
 %endif
 %endif
 %endif
 %{?python_provide:%python_provide python2-%{pypi_name}}
 %{?python_provide:%python_provide python2-%{pypi_name}}
+%endif
+
+%if %{with python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-rpm-macros
+%if ! %{with bootstrap}
+%if %{with test}
+BuildRequires:  python3-pytest
+BuildRequires:  python3-jsonschema
+%endif
+%if %{with signatures}
+BuildRequires:  python3-pyxdg
+BuildRequires:  python3-keyring
+%endif
+%endif
+%endif
 
 
 %global _description \
 %global _description \
 A built-package format for Python.\
 A built-package format for Python.\
@@ -54,8 +66,10 @@ compatible install in a way that is very close to the on-disk format.
 Python 2 version.
 Python 2 version.
 
 
 
 
+%if %{with python3}
 %package -n     python3-%{pypi_name}
 %package -n     python3-%{pypi_name}
 Summary:        %{summary}
 Summary:        %{summary}
+Group:          programming
 BuildRequires:  python3-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools
 %if ! %{with bootstrap}
 %if ! %{with bootstrap}
@@ -73,52 +87,104 @@ BuildRequires:  python3-keyring
 %description -n python3-%{pypi_name} %{_description}
 %description -n python3-%{pypi_name} %{_description}
 
 
 Python 3 version.
 Python 3 version.
+%endif
+
 
 
 %prep
 %prep
 %setup -q -n %{pypi_name}-%{version}
 %setup -q -n %{pypi_name}-%{version}
-# remove unneeded shebangs
-sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
-%patch0 -p1
+
 
 
 %build
 %build
+%if %{with python2}
 %py_build
 %py_build
+%endif
+%if %{with python3}
 %py3_build
 %py3_build
+%endif
+
 
 
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
+%if %{with python2}
 %py_install
 %py_install
 %if %{with tool}
 %if %{with tool}
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python_version}}
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python_version}}
 ln -s %{pypi_name}-%{python_version} %{buildroot}%{_bindir}/%{pypi_name}-2
 ln -s %{pypi_name}-%{python_version} %{buildroot}%{_bindir}/%{pypi_name}-2
 %endif
 %endif
+%endif
 
 
+%if %{with python3}
 %py3_install
 %py3_install
 %if %{with tool}
 %if %{with tool}
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
 ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
 ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
-
-ln -s %{pypi_name}-2 %{buildroot}%{_bindir}/%{pypi_name}
 %endif
 %endif
+%endif
+
 
 
 %if %{with test}
 %if %{with test}
 %check
 %check
-rm setup.cfg
+rm -f setup.cfg
+%if %{with python2}
 PYTHONPATH=%{buildroot}%{python_sitelib} py.test-2 -v --ignore build
 PYTHONPATH=%{buildroot}%{python_sitelib} py.test-2 -v --ignore build
+%endif
+%if %{with python3}
 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
 %endif
+%endif
+
+
+%if %{with python2}
+%pre
+if [ ! -L %{_bindir}/%{pypi_name} ]; then
+  rm -f %{_bindir}/%{pypi_name}
+fi
+
+%post
+/sbin/update-alternatives \
+  --install %{_bindir}/%{pypi_name} %{pypi_name} \
+  %{_bindir}/%{pypi_name}-%{python_version} %{python_version_nodots}
+
+%preun
+if [ "$1" = 0 ]; then
+  /sbin/update-alternatives \
+    --remove %{pypi_name} %{_bindir}/%{pypi_name}-%{python_version}
+fi
+%endif
+
+%if %{with python3}
+%pre -n python3-%{pypi_name}
+if [ ! -L %{_bindir}/%{pypi_name} ]; then
+  rm -f %{_bindir}/%{pypi_name}
+fi
+
+%post -n python3-%{pypi_name}
+/sbin/update-alternatives \
+  --install %{_bindir}/%{pypi_name} %{pypi_name} \
+  %{_bindir}/%{pypi_name}-%{python3_version} %{python3_version_nodots}
+
+%preun -n python3-%{pypi_name}
+if [ "$1" = 0 ]; then
+  /sbin/update-alternatives \
+    --remove %{pypi_name} %{_bindir}/%{pypi_name}-%{python3_version}
+fi
+%endif
 
 
+
+%if %{with python2}
 %files
 %files
 %license LICENSE.txt
 %license LICENSE.txt
 %doc CHANGES.txt README.txt
 %doc CHANGES.txt README.txt
 %if %{with tool}
 %if %{with tool}
-%{_bindir}/%{pypi_name}
 %{_bindir}/%{pypi_name}-2
 %{_bindir}/%{pypi_name}-2
 %{_bindir}/%{pypi_name}-%{python_version}
 %{_bindir}/%{pypi_name}-%{python_version}
 %endif
 %endif
 %{python_sitelib}/%{pypi_name}*
 %{python_sitelib}/%{pypi_name}*
 %exclude %{python_sitelib}/%{pypi_name}/test
 %exclude %{python_sitelib}/%{pypi_name}/test
+%endif
 
 
+%if %{with python3}
 %files -n python3-%{pypi_name}
 %files -n python3-%{pypi_name}
 %license LICENSE.txt
 %license LICENSE.txt
 %doc CHANGES.txt README.txt
 %doc CHANGES.txt README.txt
@@ -128,8 +194,13 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
 %endif
 %{python3_sitelib}/%{pypi_name}*
 %{python3_sitelib}/%{pypi_name}*
 %exclude %{python3_sitelib}/%{pypi_name}/test
 %exclude %{python3_sitelib}/%{pypi_name}/test
+%endif
+
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.35.0-1
+- new upstream release.
+
 * Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.30.0a0-8
 * Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.30.0a0-8
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 25 - 11
p/python-whoosh/python-whoosh-vl.spec

@@ -5,21 +5,22 @@
 
 
 %global mod_name Whoosh
 %global mod_name Whoosh
 
 
+Summary:        Fast, pure-Python full text indexing, search, and spell checking library
 Name:           python-whoosh
 Name:           python-whoosh
 Version:        2.7.4
 Version:        2.7.4
-Release:        13%{?_dist_release}
-Summary:        Fast, pure-Python full text indexing, search, and spell checking library 
-
-License:        BSD 
-URL:            http://pythonhosted.org/Whoosh/
-
+Release:        14%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
+License:        BSD 
+URL:            http://pythonhosted.org/Whoosh/
 Source0:        https://pypi.python.org/packages/source/W/%{mod_name}/%{mod_name}-%{version}.tar.gz
 Source0:        https://pypi.python.org/packages/source/W/%{mod_name}/%{mod_name}-%{version}.tar.gz
 
 
 BuildArch:      noarch
 BuildArch:      noarch
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-rpm-macros
+
+BuildRequires:  python2-rpm-macros
 BuildRequires:  python-devel
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools
 
 
@@ -41,10 +42,12 @@ implemented in pure Python. Programmers can use it to easily add search
 functionality to their applications and websites. Every part of how Whoosh
 functionality to their applications and websites. Every part of how Whoosh
 works can be extended or replaced to meet your needs exactly.
 works can be extended or replaced to meet your needs exactly.
 
 
+
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %package -n python3-whoosh
 %package -n python3-whoosh
 Summary:    Fast, Python3 full text indexing, search, and spell checking library
 Summary:    Fast, Python3 full text indexing, search, and spell checking library
 %{?python_provide:%python_provide python%{python3_pkgversion}-whoosh}
 %{?python_provide:%python_provide python%{python3_pkgversion}-whoosh}
+Group:          programming
 
 
 %description -n python3-whoosh
 %description -n python3-whoosh
 Whoosh is a fast, featureful full-text indexing and searching library
 Whoosh is a fast, featureful full-text indexing and searching library
@@ -53,11 +56,13 @@ functionality to their applications and websites. Every part of how Whoosh
 works can be extended or replaced to meet your needs exactly.
 works can be extended or replaced to meet your needs exactly.
 %endif
 %endif
 
 
+
 %prep
 %prep
 %setup -q -n %{mod_name}-%{version}
 %setup -q -n %{mod_name}-%{version}
 
 
+
 %build
 %build
-%py_build
+%py2_build
 
 
 %if %{with docs}
 %if %{with docs}
 sphinx-build docs/source docs/html
 sphinx-build docs/source docs/html
@@ -71,19 +76,24 @@ rm -f docs/html/.buildinfo
 rm -rf docs/html/.doctrees
 rm -rf docs/html/.doctrees
 %endif
 %endif
 
 
+
 %install
 %install
-%py_install
+%py2_install
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %py3_install
 %py3_install
 %endif
 %endif
 
 
+
+%if 0
 %check
 %check
-%{__python} setup.py test
+{__python2} setup.py test
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %{__python3} setup.py test
 %{__python3} setup.py test
 %endif
 %endif
+%endif
+
 
 
 %files
 %files
 %license LICENSE.txt
 %license LICENSE.txt
@@ -91,8 +101,8 @@ rm -rf docs/html/.doctrees
 %if %{with docs}
 %if %{with docs}
 %doc docs/html/
 %doc docs/html/
 %endif
 %endif
-%{python_sitelib}/*.egg-info/
-%{python_sitelib}/whoosh
+%{python2_sitelib}/*.egg-info/
+%{python2_sitelib}/whoosh
 
 
 %if 0%{?with_python3}
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-whoosh
 %files -n python%{python3_pkgversion}-whoosh
@@ -105,7 +115,11 @@ rm -rf docs/html/.doctrees
 %{python3_sitelib}/*.egg-info/
 %{python3_sitelib}/*.egg-info/
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.7.4-14
+- rebuilt with python-3.8.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.7.4-13
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.7.4-13
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 313 - 0
p/python2-dns/python2-dns-vl.spec

@@ -0,0 +1,313 @@
+Name:           python2-dns
+Version:        1.16.0
+Release:        2%{?_dist_release}
+Summary:        DNS toolkit for Python
+Summary(ja):    Python 用 DNS ツールキット
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        MIT
+URL:            http://www.dnspython.org/
+Source0:        http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz
+Source1:        http://www.dnspython.org/kits/%{version}/dnspython-%{version}.tar.gz.asc
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch:      noarch
+BuildRequires: python-setuptools
+BuildRequires: python-devel
+BuildRequires: python-rpm-macros
+BuildRequires: python-crypto
+Obsoletes:     python-dns < %{version}-2
+Provides:      python-dns = %{version}-%{release}
+
+%description
+dnspython is a DNS toolkit for Python. It supports almost all record
+types. It can be used for queries, zone transfers, and dynamic
+updates. It supports TSIG authenticated messages and EDNS0.
+
+dnspython provides both high and low level access to DNS. The high
+level classes perform queries for data of a given name, type, and
+class, and return an answer set. The low level classes allow direct
+manipulation of DNS zones, messages, names, and records.
+
+
+%prep
+%setup0 -q -n dnspython-%{version}
+
+# strip executable permissions so that we don't pick up dependencies
+# from documentation
+find examples -type f | xargs chmod a-x
+
+
+%build
+%py_build
+
+
+%install
+rm -rf %{buildroot}
+%py_install
+
+
+#%check
+#%{__python} setup.py test
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%license LICENSE
+%doc README* examples
+%{python_sitelib}/*egg-info
+%{python_sitelib}/dns
+
+
+%changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-2
+- changed %%name.
+- build with python2 only.
+
+* Tue May 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.0-1
+- new upstream release.
+- added python3 support.
+
+* Sun Jan 12 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 1.10.0-3
+- rebuild with VineSeed environment
+
+* Mon Apr 08 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.10.0-2
+- add BR: python-devel, python
+
+* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.0-1
+- new upstream release
+
+* Thu Apr 05 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9.4-1
+- initial build for Vine Linux
+
+* Mon Mar 28 2011 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.4-1
+-
+- dnspython 1.9.4 has been released and is available at
+- http://www.dnspython.org/kits/1.9.4/
+-
+- There is no new functionality in this release; just a few bug fixes
+- in RRSIG and SIG code.
+-
+- I will be eliminating legacy code for earlier versions of DNSSEC in a
+- future release of dnspython.
+
+* Fri Mar 25 2011 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.3-1
+-
+- New since 1.9.2:
+-
+-     A boolean parameter, 'raise_on_no_answer', has been added to
+- the query() methods.  In no-error, no-data situations, this
+- parameter determines whether NoAnswer should be raised or not.
+- If True, NoAnswer is raised.  If False, then an Answer()
+- object with a None rrset will be returned.
+-
+- Resolver Answer() objects now have a canonical_name field.
+-
+- Rdata now have a __hash__ method.
+-
+- Bugs fixed since 1.9.2:
+-
+-        Dnspython was erroneously doing case-insensitive comparisons
+- of the names in NSEC and RRSIG RRs.
+-
+- We now use "is" and not "==" when testing what section an RR
+- is in.
+-
+- The resolver now disallows metaqueries.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Nov 23 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.2-1
+- It's brown paper bag time :) The fix for the import problems was
+- actually bad, but didn't show up in testing because the test suite's
+- conditional importing code hid the problem.
+-
+- Any, 1.9.2 is out.
+-
+- Sorry for the churn!
+
+* Mon Nov 22 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.9.1-1
+- New since 1.9.0:
+-
+-        Nothing.
+-
+- Bugs fixed since 1.9.0
+-
+-        The dns.dnssec module didn't work with DSA due to namespace
+-        contamination from a "from"-style import.
+-
+- New since 1.8.0:
+-
+-        dnspython now uses poll() instead of select() when available.
+-
+-        Basic DNSSEC validation can be done using dns.dnsec.validate()
+-        and dns.dnssec.validate_rrsig() if you have PyCrypto 2.3 or
+-        later installed.  Complete secure resolution is not yet
+-        available.
+-
+-        Added key_id() to the DNSSEC module, which computes the DNSSEC
+-        key id of a DNSKEY rdata.
+-
+-        Added make_ds() to the DNSSEC module, which returns the DS RR
+-        for a given DNSKEY rdata.
+-
+-        dnspython now raises an exception if HMAC-SHA284 or
+-        HMAC-SHA512 are used with a Python older than 2.5.2.  (Older
+-        Pythons do not compute the correct value.)
+-
+-        Symbolic constants are now available for TSIG algorithm names.
+-
+- Bugs fixed since 1.8.0
+-
+-        dns.resolver.zone_for_name() didn't handle a query response
+-        with a CNAME or DNAME correctly in some cases.
+-
+-        When specifying rdata types and classes as text, Unicode
+-        strings may now be used.
+-
+-        Hashlib compatibility issues have been fixed.
+-
+-        dns.message now imports dns.edns.
+-
+-        The TSIG algorithm value was passed incorrectly to use_tsig()
+-        in some cases.
+
+* Fri Aug 13 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.8.0-3
+- Add a patch from upstream to fix a Python 2.7 issue.
+
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.8.0-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Wed Jan 27 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.8.0-1.1
+- Fix error
+
+* Wed Jan 27 2010 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.8.0-1
+- New since 1.7.1:
+-
+-  Support for hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384 and
+-  hmac-sha512 has been contributed by Kevin Chen.
+-
+-  The tokenizer's tokens are now Token objects instead of (type,
+-  value) tuples.
+-
+- Bugs fixed since 1.7.1:
+-
+-  Escapes in masterfiles now work correctly.  Previously they were
+-  only working correctly when the text involved was part of a domain
+-  name.
+-
+-  When constructing a DDNS update, if the present() method was used
+-  with a single rdata, a zero TTL was not added.
+-
+-  The entropy pool needed locking to be thread safe.
+-
+-  The entropy pool's reading of /dev/random could cause dnspython to
+-  block.
+-
+-  The entropy pool did buffered reads, potentially consuming more
+-  randomness than we needed.
+-
+-  The entropy pool did not seed with high quality randomness on
+-  Windows.
+-
+-  SRV records were compared incorrectly.
+-
+-  In the e164 query function, the resolver parameter was not used.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 19 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.1-1
+- New since 1.7.0:
+-
+-        Nothing
+-
+- Bugs fixed since 1.7.0:
+-
+-        The 1.7.0 kitting process inadventently omitted the code for the
+-        DLV RR.
+-
+-        Negative DDNS prerequisites are now handled correctly.
+
+* Fri Jun 19 2009 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.7.0-1
+- New since 1.6.0:
+-
+-        Rdatas now have a to_digestable() method, which returns the
+-        DNSSEC canonical form of the rdata, suitable for use in
+-        signature computations.
+-
+-        The NSEC3, NSEC3PARAM, DLV, and HIP RR types are now supported.
+-
+-        An entropy module has been added and is used to randomize query ids.
+-
+-        EDNS0 options are now supported.
+-
+-        UDP IXFR is now supported.
+-
+-        The wire format parser now has a 'one_rr_per_rrset' mode, which
+-        suppresses the usual coalescing of all RRs of a given type into a
+-        single RRset.
+-
+-        Various helpful DNSSEC-related constants are now defined.
+-
+-        The resolver's query() method now has an optional 'source' parameter,
+-        allowing the source IP address to be specified.
+-
+- Bugs fixed since 1.6.0:
+-
+-        On Windows, the resolver set the domain incorrectly.
+-
+-        DS RR parsing only allowed one Base64 chunk.
+-
+-        TSIG validation didn't always use absolute names.
+-
+-        NSEC.to_text() only printed the last window.
+-
+-        We did not canonicalize IPv6 addresses before comparing them; we
+-        would thus treat equivalent but different textual forms, e.g.
+-        "1:00::1" and "1::1" as being non-equivalent.
+-
+-        If the peer set a TSIG error, we didn't raise an exception.
+-
+-        Some EDNS bugs in the message code have been fixed (see the ChangeLog
+-        for details).
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Nov 29 2008 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.6.0-3
+- Rebuild for Python 2.6
+
+* Fri Aug 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.6.0-2
+- fix license tag
+
+* Tue Dec  4 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.6.0-1
+- Update to 1.6.0
+
+* Tue Oct  9 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.0-2
+- Follow new Python egg packaging specs
+
+* Thu Jan 11 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.5.0-1
+- Update to 1.5.0
+
+* Fri Dec  8 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-3
+- Bump release for rebuild with Python 2.5
+
+* Mon Aug 14 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-2
+- No longer ghost *.pyo files, thus further simplifying the files section.
+
+* Sat Aug  5 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.4.0-1
+- Update to 1.4.0
+- Remove unneeded python-abi requires
+- Remove unneeded python_sitearch macro
+
+* Fri May 26 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.3.5-1
+- First version for Fedora Extras
+

+ 166 - 0
p/python2-pycairo/python2-pycairo-vl.spec

@@ -0,0 +1,166 @@
+%bcond_without python2
+
+Name: python2-pycairo
+Summary: Python bindings for the cairo library
+Summary(ja): cairo ライブラリの Python バインディング
+Version: 1.18.2
+Release: 2%{?_dist_release}
+Group: programming
+
+License: LGPLv2
+URL: https://cairographics.org/pycairo
+Source: pycairo-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: cairo-devel >= 1.8.10
+BuildRequires: python-rpm-macros
+%if %{with python2}
+BuildRequires: python-devel >= 2.6
+BuildRequires: python-setuptools
+BuildRequires: python2-rpm-macros
+%endif
+BuildRequires: pkgconfig
+Requires: cairo >= 1.8.10
+Obsoletes: pycairo < 1.18.2-2
+Provides: pycairo = %{version}-%{release}
+
+%description
+Python bindings for the cairo library.
+
+
+%if %{with python2}
+%package devel
+Summary: Libraries and headers for pycairo
+Group: programming
+Requires: %{name} = %{version}-%{release}
+Requires: cairo-devel
+Requires: python-devel
+Obsoletes: pycairo-devel < 1.18.2-2
+Provides: pycairo-devel = %{version}-%{release}
+
+%description devel
+This package contains files required to build wrappers for cairo add-on
+libraries so that they interoperate with pycairo.
+%endif
+
+
+%prep
+%setup -q -n pycairo-%{version}
+
+%build
+%if %{with python2}
+%py2_build
+%endif
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%if %{with python2}
+%py2_install
+%endif
+
+find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%if %{with python2}
+%files
+%defattr(-,root,root,-)
+%license COPYING*
+%doc NEWS README*
+%{python2_sitearch}/*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/pycairo/
+%{_includedir}/pycairo/pycairo.h
+%{_libdir}/pkgconfig/pycairo.pc
+%endif
+
+
+%changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.2-2
+- changed %%name.
+- built with python2 pnly.
+
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.2-1
+- new upstream release.
+
+* Sun Jan 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.10-3
+- rebuild with VineSeed environment
+
+* Wed Feb 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.10-2
+- rebuild with python-2.7.2
+
+* Thu Sep 23 2010 Ryoichi INAGAKI <ryo1@bg.wakwak.com> 1.8.10-1
+- new upstream release
+- built wirh rpm-4.8.1
+
+* Fri Feb 12 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.8.6-2
+- rebuilt with gcc-4.4.3-3 on ppc
+
+* Tue Feb 02 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.8.6-1
+- build for python-2.6
+
+* Sat Jan 17 2009 Ryoichi INAGAKI <ryo1@bg.wakwak.com> 1.8.2-1vl5
+- new upstream release
+
+* Sun Jul 20 2008 Shu KONNO <owa@bg.wakwak.com> 1.4.12-1vl5
+- rebuilt with python-2.5.2
+- applied new versioning policy and spec in utf-8
+
+* Sun Feb 24 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.4.12-0vl1
+- new upstream release
+
+* Thu Apr 26 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 1.4.0-0vl1
+- initial build for Vine Linux
+
+* Thu Mar 15 2007 Matthew Barnes <mbarnes@redhat.com> - 1.4.0-1.fc7
+- Update to 1.4.0
+
+* Mon Feb 05 2007 Matthew Barnes <mbarnes@redhat.com> - 1.2.6-3.fc7
+- Incorporate suggestions from package review (RH bug #226329).
+
+* Thu Dec  7 2006 Jeremy Katz <katzj@redhat.com> - 1.2.6-2
+- rebuild against python 2.5
+
+* Tue Nov 28 2006 Matthew Barnes <mbarnes@redhat.com> - 1.2.6-1.fc7
+- Update to 1.2.6
+- Clean up the spec file.
+
+* Sun Oct 15 2006 Matthew Barnes <mbarnes@redhat.com> - 1.2.2-1
+- Update to 1.2.2
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.2.0-1.1
+- rebuild
+
+* Wed Jul 05 2006 John (J5) Palmieri <johnp@redhat.com> - 1.2.0-1
+- Update to upstream 1.2.0
+
+* Mon Jul  3 2006 Jeremy Katz <katzj@redhat.com> - 1.0.2-3
+- require new enough cairo (#197457)
+
+* Mon Jun 05 2006 John (J5) Palmieri <johnp@redhat.com> - 1.0.2-2
+- add pkgconfig BR
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-1.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.0.2-1.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Wed Oct 26 2005 John (J5) Palmieri <johnp@redhat.com> - 1.0.2-1
+- Updated to latest and push into rawhide
+
+* Fri Dec 10 2004 Kristian H淡gsberg <krh@redhat.com> - 0.1.3-1
+- Add python-devel build requires.
+
+* Wed Nov 24 2004  <jrb@redhat.com> - 
+- Initial build.
+

+ 222 - 0
p/python2-setuptools/python2-setuptools-vl.spec

@@ -0,0 +1,222 @@
+%bcond_with bootstrap
+
+%global srcname setuptools
+%define _unpackaged_files_terminate_build 1
+
+%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
+%global python2_wheelname %python_wheelname
+%global python2_record %{python_sitelib}/%{srcname}-%{version}.dist-info/RECORD
+
+Name:           python2-setuptools
+Version:        44.1.1
+Release:        1%{?_dist_release}
+Summary:        Download, build, install, upgrade, and uninstall Python packages
+Summary(ja):     Python パッケージのダウンロード、ビルド、インストール、アップグレードおよびアンインストール用ツール
+Group:          programming
+License:        PSFL/ZPL
+URL:            https://pypi.python.org/pypi/setuptools
+Source0:        https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.zip
+Source1:        psfl.txt
+Source2:        zpl.txt
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+BuildArch:      noarch
+BuildRequires:  python-devel
+BuildRequires:  python-rpm-macros
+%if %{without bootstrap}
+BuildRequires:  python-pip
+BuildRequires:  python-wheel
+%endif # without bootstrap
+Requires(post,postun): alternatives
+Obsoletes: python-setuptools < %{version}
+Provides: python-setuptools = %{version}-%{release}
+
+
+%description
+setuptools is a collection of enhancements to the Python distutils that allow
+you to more easily build and distribute Python packages, especially ones that
+have dependencies on other packages.
+
+%description -l ja
+setuptools は Python distutils の拡張機能を集めたツールです。
+このツールにより Python パッケージの構築や配布が簡単に行えるように
+なります。特に他のパッケージに依存しているパッケージを扱う際に便利
+です。
+
+
+%prep
+%setup -q -n %{srcname}-%{version}
+
+# We can't remove .egg-info (but it doesn't matter, since it'll be rebuilt):
+#  The problem is that to properly execute setuptools' setup.py,
+#   it is needed for setuptools to be loaded as a Distribution
+#   (with egg-info or .dist-info dir), it's not sufficient
+#   to just have them on PYTHONPATH
+#  Running "setup.py install" without having setuptools installed
+#   as a distribution gives warnings such as
+#    ... distutils/dist.py:267: UserWarning: Unknown distribution option: 'entry_points'
+#   and doesn't create "easy_install" and .egg-info directory
+# Note: this is only a problem if bootstrapping wheel or building on RHEL,
+#  otherwise setuptools are installed as dependency into buildroot
+
+# Strip shbang
+find setuptools -name \*.py | xargs sed -i -e '1 {/^#!\//d}'
+# Remove bundled exes
+rm -f setuptools/*.exe
+# These tests require internet connection
+rm setuptools/tests/test_integration.py
+
+%build
+%if %{without bootstrap}
+%py_build_wheel
+%else
+%py_build
+%endif
+
+
+%install
+rm -rf %{buildroot}
+
+%if %{without bootstrap}
+%py_install_wheel %{python2_wheelname}
+%else
+%py_install
+%endif
+
+rm -rf %{buildroot}%{python_sitelib}/setuptools/tests
+%if %{without bootstrap}
+sed -i '/^setuptools\/tests\//d' %{buildroot}%{python2_record}
+%endif
+
+find %{buildroot}%{python_sitelib} -name '*.exe' | xargs rm -f
+
+# Don't ship these
+rm -r docs/{Makefile,conf.py,_*}
+rm %{buildroot}%{_bindir}/easy_install
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%pre
+if [ ! -L %{_bindir}/easy_install ]; then
+  rm -f %{_bindir}/easy_install
+fi
+
+%post
+update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version} ||:
+update-alternatives --install %{_bindir}/easy_install easy_install \
+	                      %{_bindir}/easy_install-%{python_version} 27
+
+%triggerpostun -- python-setuptools < 5.4.2-2
+update-alternatives --auto easy_install
+
+%preun
+if [ "$1" = "0" ]
+then
+  update-alternatives --remove easy_install %{_bindir}/easy_install-%{python_version}
+fi
+
+
+%files
+%defattr(-,root,root,-)
+%license LICENSE
+%doc docs/* CHANGES.rst README.rst
+%{python_sitelib}/*
+%{_bindir}/easy_install-2*
+
+
+%changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.1-1
+- updated to 44.1.1.
+- changed %%name.
+- built with python2 only.
+
+* Wed Apr 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 44.1.0-1
+- updated to 44.1.0 (last release for Python2).
+
+* Sun Dec 17 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 38.2.4-1
+- new upstream release.
+- dropped Patch0.
+- made to use python{,3}-rpm-macros.
+
+* Sat Jul 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 25.1.1-1
+- new upstream release.
+- enable to build on Vine6.
+
+* Tue Jun 28 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 18.5-3
+- rebuild with python3-3.5.2
+
+* Thu Dec 24 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 18.5-2
+- added a subpackage: python3-setuptools.
+
+* Sun Nov 15 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 18.5-1
+- new upstream release.
+- imported patch0 from rawhide.
+
+* Mon Mar  9 2015 IWAI, Masaharu <iwaim.sub@gmail.com> - 5.4.2-2
+- alternatives for easy_install
+
+* Fri Aug 08 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 5.4.2-1
+- new upstream release
+
+* Sat Jul 26 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 5.4.1-1
+- new upstream release
+
+* Sun Jul 06 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 5.4-1
+- new upstream release
+
+* Sat Apr 26 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.4.4-1
+- new upstream release
+
+* Sun Feb 19 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.6c11-2
+- rebuild with python-2.7.2
+
+* Tue Feb 02 2010 Shu KONNO <owa@bg.wakwak.com> 0.6c11-1
+- new upstream release
+
+* Tue Feb 02 2010 Shu KONNO <owa@bg.wakwak.com> 0.6c9-2
+- rebuild with python-2.6
+
+* Sun Dec 07 2008 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.6c9-1
+- new upstream release
+- add japanese summary and description
+
+* Mon Jul 21 2008 Shu KONNO <owa@bg.wakwak.com> - 0.6c3-1vl5
+- rebuilt with python-2.5.2
+- applied new versioning policy
+
+* Sat Nov 25 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.6c3-1vl2
+- rebuilt for Vine Linux 4.0
+- changed Group to Development/Tools
+
+* Wed Nov 15 2006 Susumu Tanimura <stanimura-ngs@umin.ac.jp>
+- Refurbished for VineLinux3.2
+
+* Tue Sep 12 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c2-1
+- Upstream 0.6c2
+- Ghostbusting
+
+* Mon Jul 31 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c1-2
+- Set perms on license files (#200768)
+
+* Sat Jul 22 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6c1-1
+- Version 0.6c1
+
+* Wed Jun 28 2006 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.6b3-1
+- Taking over from Ignacio
+- Version 0.6b3
+- Ghost .pyo files in sitelib
+- Add license files
+- Remove manual python-abi, since we're building FC4 and up
+- Kill .exe files
+
+* Wed Feb 15 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.6a10-1
+- Upstream update
+
+* Mon Jan 16 2006 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.6a9-1
+- Upstream update
+
+* Sat Dec 24 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 0.6a8-1
+- Initial RPM release

+ 162 - 64
p/python3/python3-vl.spec

@@ -1,29 +1,93 @@
-# if you wanna test, add " --define '_run_test 1' " option to rpmbuild command
-%define run_test %{?_run_test:1}%{!?_run_test:0}
-%define libvers 3.5
-%define binsuffix 3.5
+%bcond_with run_test
+
+%define libvers 3.8
+%define binsuffix 3.8
 %define python_lib %{_libdir}/python%{libvers}
 %define python_lib %{_libdir}/python%{libvers}
 %define config_htmldir /var/www/html/python
 %define config_htmldir /var/www/html/python
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
 Name: python3
-Version: 3.5.9
+Version: 3.8.5
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Development/Languages
+Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
-License: PSF
+License: Python
 URL: http://www.python.org/download/releases/%{version}
 URL: http://www.python.org/download/releases/%{version}
 Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
 Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
 Source1: https://docs.python.org/ftp/python/doc/%{version}/python-%{version}-docs-html.tar.bz2
 Source1: https://docs.python.org/ftp/python/doc/%{version}/python-%{version}-docs-html.tar.bz2
-Patch1: python-3.5.2-lib64.patch
-Patch2: python3-3.4.4-revert-makefile.patch
+# (Patches taken from github.com/fedora-python/cpython)
+
+# 00001 # d06a8853cf4bae9e115f45e1d531d2dc152c5cc8
+# Fixup distutils/unixccompiler.py to remove standard library path from rpath
+# Was Patch0 in ivazquez' python3000 specfile
+Patch1: 00001-rpath.patch
+
+# 00102 # ec4353c0f646eb567cc0d63e1e41eb5e29cc3e81
+# Change the various install paths to use /usr/lib64/ instead or /usr/lib/
+#
+# Only used when "%%{_lib}" == "lib64".
+Patch102: 00102-lib64.patch
+
+# 00111 # 03918d404a40a50c9f5f93dc748b52e613d70d31
+# Don't try to build a libpythonMAJOR.MINOR.a
+#
+# Downstream only: not appropriate for upstream.
+#
+# See https://bugzilla.redhat.com/show_bug.cgi?id=556092
+Patch111: 00111-no-static-lib.patch
+
+# 00189 # adf51ed04ac74fd6fc39c642af35b87680c71dab
+# Instead of bundled wheels, use our RPM packaged wheels
+#
+# We keep them in /usr/share/python-wheels
+#
+# Downstream only: upstream bundles
+# We might eventually pursuit upstream support, but it's low prio
+Patch189: 00189-use-rpm-wheels.patch
+# The following versions of setuptools/pip are bundled when this patch is not applied.
+# The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
+# When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
+# In such cases, the patch needs to be amended and the versions updated here:
+%global pip_version 20.1.1
+%global setuptools_version 47.1.0
+
+# 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356
+# Change user install location
+#
+# Set values of prefix and exec_prefix in distutils install command
+# to /usr/local if executable is /usr/bin/python* and RPM build
+# is not detected to make pip and distutils install into separate location.
+#
+# Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
+# Downstream only: Awaiting resources to work on upstream PEP
+Patch251: 00251-change-user-install-location.patch
+
+# 00274 # 1e9258f6e8f70e86d5130113d3eed22993cf3da9
+# Upstream uses Debian-style architecture naming, change to match Fedora
+Patch274: 00274-fix-arch-names.patch
+
+# 00328 # 367fdcb5a075f083aea83ac174999272a8faf75c
+# Restore pyc to TIMESTAMP invalidation mode as default in rpmbuild
+#
+# Since Fedora 31, the $SOURCE_DATE_EPOCH is set in rpmbuild to the latest
+# %%changelog date. This makes Python default to the CHECKED_HASH pyc
+# invalidation mode, bringing more reproducible builds traded for an import
+# performance decrease. To avoid that, we don't default to CHECKED_HASH
+# when $RPM_BUILD_ROOT is set (i.e. when we are building RPM packages).
+#
+# See https://src.fedoraproject.org/rpms/redhat-rpm-config/pull-request/57#comment-27426
+# Downstream only: only used when building RPM packages
+# Ideally, we should talk to upstream and explain why we don't want this
+Patch328: 00328-pyc-timestamp-invalidation-mode.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gzip tar gcc-c++ pkgconfig sed findutils
+BuildRequires: autoconf
 BuildRequires: bzip2-devel
 BuildRequires: bzip2-devel
 BuildRequires: expat-devel
 BuildRequires: expat-devel
+BuildRequires: findutils
+BuildRequires: gcc-c++
 BuildRequires: gdbm-devel
 BuildRequires: gdbm-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-devel
 BuildRequires: libdb-devel
 BuildRequires: libdb-devel
@@ -33,17 +97,13 @@ BuildRequires: libtirpc-devel
 BuildRequires: libxcrypt-devel
 BuildRequires: libxcrypt-devel
 BuildRequires: ncurses-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
 BuildRequires: openssl-devel
+BuildRequires: pkgconfig
 BuildRequires: readline-devel
 BuildRequires: readline-devel
 BuildRequires: sqlite3-devel
 BuildRequires: sqlite3-devel
+BuildRequires: tar
 BuildRequires: valgrind-devel
 BuildRequires: valgrind-devel
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
 BuildRequires: zlib-devel
-Requires: bzip2
-Requires: gdbm
-Requires: ncurses
-Requires: openssl
-Requires: readline
-Requires: sqlite3
-Requires: zlib
 
 
 %description
 %description
 Python is an interpreted, interactive, object-oriented programming
 Python is an interpreted, interactive, object-oriented programming
@@ -56,9 +116,10 @@ a programmable interface.  Finally, Python is portable: it runs on many
 brands of UNIX, on PCs under Windows, MS-DOS, and OS/2, and on the
 brands of UNIX, on PCs under Windows, MS-DOS, and OS/2, and on the
 Mac.
 Mac.
 
 
+
 %package devel
 %package devel
 Summary: The libraries and header files needed for Python development.
 Summary: The libraries and header files needed for Python development.
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: libtirpc-devel
 Requires: libtirpc-devel
 
 
@@ -75,7 +136,7 @@ documentation.
 
 
 %package tkinter
 %package tkinter
 Summary: A graphical user interface for the Python scripting language.
 Summary: A graphical user interface for the Python scripting language.
-Group: Development/Languages
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: tcl, tk, tix
 Requires: tcl, tk, tix
 Requires: libX11, libxcb, libXau, libXdmcp
 Requires: libX11, libxcb, libXau, libXdmcp
@@ -89,9 +150,10 @@ the Python scripting language.
 You should install the tkinter package if you'd like to use a graphical
 You should install the tkinter package if you'd like to use a graphical
 user interface for Python programming.
 user interface for Python programming.
 
 
+
 %package tools
 %package tools
 Summary: A collection of development tools included with Python.
 Summary: A collection of development tools included with Python.
-Group: Development/Tools
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-tkinter = %{version}
 Requires: %{name}-tkinter = %{version}
 
 
@@ -99,10 +161,11 @@ Requires: %{name}-tkinter = %{version}
 The Python package includes several development tools that are used
 The Python package includes several development tools that are used
 to build python programs.
 to build python programs.
 
 
+
 %package docs
 %package docs
 Summary: Documentation for the Python programming language.
 Summary: Documentation for the Python programming language.
 Summary(ja): Python プログラミング言語のドキュメント
 Summary(ja): Python プログラミング言語のドキュメント
-Group: Documentation
+Group: documentation
 
 
 %description docs
 %description docs
 The python-docs package contains documentation on the Python
 The python-docs package contains documentation on the Python
@@ -113,65 +176,85 @@ Install the python-docs package if you'd like to use the documentation
 for the Python language.
 for the Python language.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n Python-%{version}
 %setup -q -n Python-%{version}
-%if %{_lib} == lib64
-%patch1 -p1 -b .lib64
+# Remove all exe files to ensure we are not shipping prebuilt binaries
+# note that those are only used to create Microsoft Windows installers
+# and that functionality is broken on Linux anyway
+find -name '*.exe' -print -delete
+
+# Remove bundled libraries to ensure that we're using the system copy.
+rm -r Modules/expat
+
+#
+# Apply patches:
+#
+%patch1 -p1
+
+%if "%{_lib}" == "lib64"
+%patch102 -p1
 %endif
 %endif
-%patch2 -p1 -b .libpl
+%patch111 -p1
+
+%if %{with rpmwheels}
+%patch189 -p1
+rm Lib/ensurepip/_bundled/*.whl
+%endif
+
+%patch251 -p1
+%patch274 -p1
+%patch328 -p1
+
+# Remove files that should be generated by the build
+# (This is after patching, so that we can use patches directly from upstream)
+rm configure pyconfig.h.in
+
+# Regenerate the configure script and pyconfig.h.in
+autoconf
+autoheader
 
 
 
 
 %build
 %build
-if pkg-config libtirpc ; then
-        export CFLAGS="$CFLAGS $(pkg-config --cflags libtirpc)"
-        export CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libtirpc)"
-        export LDFLAGS="$LDFLAGS $(pkg-config --libs-only-L libtirpc)"
-        export LIBS="$LIBS $(pkg-config --libs-only-l libtirpc)"
-fi
+export CFLAGS="%{?extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
+export CFLAGS_NODIST="%{?build_cflags} -D_GNU_SOURCE -fPIC -fwrapv%{?with_no_semantic_interposition: -fno-semantic-interposition}"
+export CXXFLAGS="%{?extension_cxxflags} -D_GNU_SOURCE -fPIC -fwrapv"
+export CPPFLAGS="$(pkg-config --cflags-only-I libffi)"
+export OPT="%{?extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
+export LINKCC="gcc"
+export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)"
+export LDFLAGS="%{?extension_ldflags} -g $(pkg-config --libs-only-L openssl)"
+export LDFLAGS_NODIST="%{?build_ldflags}%{?with_no_semantic_interposition: -fno-semantic-interposition} -g $(pkg-config --libs-only-L openssl)"
+
 ./configure \
 ./configure \
 	--prefix=%{_prefix} \
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--libdir=%{_libdir} \
-	--enable-shared \
 	--enable-ipv6 \
 	--enable-ipv6 \
-	--with-fpectl \
-	--with-doc-strings \
-	--with-pymalloc \
-	--with-signal-module \
+	--enable-shared \
+	--with-computed-gotos=yes \
+	--with-dbmliborder=gdbm:ndbm:bdb \
+	--with-system-expat \
 	--with-system-ffi \
 	--with-system-ffi \
-	--with-threads \
+	--enable-loadable-sqlite-extensions \
+	--with-lto \
+	--with-ssl-default-suites=openssl \
 	--with-valgrind \
 	--with-valgrind \
 	--without-ensurepip \
 	--without-ensurepip \
-%ifarch x86_64
-	--with-universal-archs=64-bit \
-%endif
-	CXX=g++;
+	--enable-optimizations \
+	%{nil}
 
 
-cat <<EOF >> Modules/Setup.local
-_socket socketmodule.c
-SSL=%{_prefix}
-_ssl _ssl.c \
-       -DUSE_SSL -I%{_includedir} -I%{_includedir}/openssl \
-       -L%{_libdir} -lssl -lcrypto
-EOF
+make %{?_smp_mflags} CFLAGS_NODIST="$CFLAGS_NODIST" \
+	regen-all PYTHON_FOR_REGEN="python%{binsuffix}"
 
 
-make %{?_smp_mflags}
-
-%if %{run_test}
-make test
-%endif
+make %{?_smp_mflags} CFLAGS_NODIST="$CFLAGS_NODIST"
 
 
 
 
 %install
 %install
 [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-echo '[install_scripts]' >setup.cfg
-echo 'install_dir='"${RPM_BUILD_ROOT}%{_bindir}" >> setup.cfg
-
-mkdir -p $RPM_BUILD_ROOT%{python_lib}/lib-dynload
 make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
 make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
 
 
-# if --with-wide-unicode at configure
-ln -s python%{libvers}m $RPM_BUILD_ROOT%{_includedir}/python%{libvers}
-
 # replace path in pydoc
 # replace path in pydoc
 if [ ! -z "%{binsuffix}" ]
 if [ ! -z "%{binsuffix}" ]
 then
 then
@@ -261,11 +344,20 @@ fi
 rm -f /tmp/python-rpm-files.$$
 rm -f /tmp/python-rpm-files.$$
 
 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%if %{with run_test}
+%check
+make test
+%endif
+
+
 %clean
 %clean
 rm -fr $RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT
 
 
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
 %files -f mainpkg.files
 %files -f mainpkg.files
 %defattr(-, root, root)
 %defattr(-, root, root)
 %license LICENSE
 %license LICENSE
@@ -277,9 +369,12 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %files devel
 %files devel
 %defattr(-,root,root)
 %defattr(-,root,root)
-%dir %{_includedir}/python%{libvers}m
-%{_includedir}/python%{libvers}m/*.h
-%{_includedir}/python%{libvers}
+%dir %{_includedir}/python%{libvers}
+%dir %{_includedir}/python%{libvers}/cpython
+%dir %{_includedir}/python%{libvers}/internal
+%{_includedir}/python%{libvers}/*.h
+%{_includedir}/python%{libvers}/cpython/*.h
+%{_includedir}/python%{libvers}/internal/*.h
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 
 
 %files -f tools.files tools
 %files -f tools.files tools
@@ -296,6 +391,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.5-1
+- new upstream release.
+
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.9-1
 * Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.9-1
 - new upstream release.
 - new upstream release.
 
 

+ 28 - 15
p/pytz/pytz-vl.spec

@@ -1,27 +1,28 @@
 %bcond_with check
 %bcond_with check
 
 
-%define pathfix %{_libdir}/python3.5/Tools/scripts/pathfix.py
+%define pathfix %{_libdir}/python%{python3_version}/Tools/scripts/pathfix.py
 
 
 Name: pytz
 Name: pytz
-Version: 2018.7
+Version: 2020.1
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Summary: World Timezone Definitions for Python
 Summary: World Timezone Definitions for Python
 Summary(ja): Python 用の世界タイムゾーン定義
 Summary(ja): Python 用の世界タイムゾーン定義
-
-Group: Development/Languages
-License: MIT
-URL: http://pytz.sourceforge.net/
+Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
-Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+License: MIT
+URL: https://pytz.sourceforge.net/
+
+Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 # Patch to use the system supplied zoneinfo files
 # Patch to use the system supplied zoneinfo files
 Patch0: pytz-zoneinfo.patch
 Patch0: pytz-zoneinfo.patch
 # https://bugzilla.redhat.com/1497572
 # https://bugzilla.redhat.com/1497572
 Patch1: remove_tzinfo_test.patch
 Patch1: remove_tzinfo_test.patch
 
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: python-rpm-macros
 
 
 %description
 %description
 pytz brings the Olson tz database into Python. This library allows accurate
 pytz brings the Olson tz database into Python. This library allows accurate
@@ -35,8 +36,9 @@ Amost all (over 540) of the Olson timezones are supported.
 %package -n python-%{name}
 %package -n python-%{name}
 Summary:        World Timezone Definitions for Python
 Summary:        World Timezone Definitions for Python
 Summary(ja):    Python 用の世界タイムゾーン定義
 Summary(ja):    Python 用の世界タイムゾーン定義
+Group:          programming
 %{?python_provide:%python_provide python2-%{name}}
 %{?python_provide:%python_provide python2-%{name}}
-BuildRequires:  python-devel, python-rpm-macros
+BuildRequires:  python-devel, python2-rpm-macros
 %if %{with check}
 %if %{with check}
 BuildRequires:  python-pytest
 BuildRequires:  python-pytest
 %endif
 %endif
@@ -54,9 +56,11 @@ which you can read more about in the Python Library Reference
 
 
 Amost all (over 540) of the Olson timezones are supported.
 Amost all (over 540) of the Olson timezones are supported.
 
 
+
 %package -n python3-%{name}
 %package -n python3-%{name}
 Summary:        World Timezone Definitions for Python
 Summary:        World Timezone Definitions for Python
 Summary(ja):    Python 用の世界タイムゾーン定義
 Summary(ja):    Python 用の世界タイムゾーン定義
+Group:          programming
 %{?python_provide:%python_provide python3-%{name}}
 %{?python_provide:%python_provide python3-%{name}}
 BuildRequires:  python3-devel, python3-rpm-macros
 BuildRequires:  python3-devel, python3-rpm-macros
 %if %{with check}
 %if %{with check}
@@ -73,29 +77,34 @@ which you can read more about in the Python Library Reference
 
 
 Amost all (over 540) of the Olson timezones are supported.
 Amost all (over 540) of the Olson timezones are supported.
 
 
+
 %prep
 %prep
 %autosetup -p1
 %autosetup -p1
 
 
+
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-%py_install
-rm -r %{buildroot}%{python_sitelib}/pytz/zoneinfo
-%{pathfix} -p -i %{__python} %{buildroot}%{python_sitelib}
+%py2_install
+rm -r %{buildroot}%{python2_sitelib}/pytz/zoneinfo
+%{pathfix} -p -i %{__python2} %{buildroot}%{python2_sitelib}
 
 
 %py3_install
 %py3_install
 rm -r %{buildroot}%{python3_sitelib}/pytz/zoneinfo
 rm -r %{buildroot}%{python3_sitelib}/pytz/zoneinfo
 %{pathfix} -p -i %{__python3} %{buildroot}%{python3_sitelib}
 %{pathfix} -p -i %{__python3} %{buildroot}%{python3_sitelib}
 
 
+
 %if %{with check}
 %if %{with check}
 %check
 %check
 PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v
 PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} -m pytest -v
 PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} -m pytest -v
 %endif
 %endif
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -104,8 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license LICENSE.txt
 %license LICENSE.txt
 %doc README.txt
 %doc README.txt
-%{python_sitelib}/pytz/
-%{python_sitelib}/*.egg-info
+%{python2_sitelib}/pytz/
+%{python2_sitelib}/*.egg-info
 
 
 %files -n python3-pytz
 %files -n python3-pytz
 %license LICENSE.txt
 %license LICENSE.txt
@@ -113,7 +122,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/pytz/
 %{python3_sitelib}/pytz/
 %{python3_sitelib}/*.egg-info
 %{python3_sitelib}/*.egg-info
 
 
+
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.1-1
+- new upstream release.
+
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2018.7-1
 * Tue Nov 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2018.7-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 6 - 3
s/samba/samba-vl.spec

@@ -3,7 +3,7 @@
 
 
 %define samba_version 4.12.6
 %define samba_version 4.12.6
 #define rc_number rc4
 #define rc_number rc4
-%define samba_release 1
+%define samba_release 2
 
 
 %define doc_version 4.12.0
 %define doc_version 4.12.0
 %define api_version 4.0
 %define api_version 4.0
@@ -64,6 +64,8 @@ Source201:     named.conf.dlz
 
 
 Source999: perl-requires.sh
 Source999: perl-requires.sh
 
 
+BuildRoot: %{_tmppath}/%{name}-%{samba_version}-%{release}-root
+
 Requires: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Requires: /sbin/chkconfig /bin/mktemp /usr/bin/killall
 Requires: fileutils sed /etc/init.d
 Requires: fileutils sed /etc/init.d
 Requires: logrotate
 Requires: logrotate
@@ -89,8 +91,6 @@ Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/chkconfig, /sbin/service
 %endif
 %endif
 
 
-BuildRoot: %{_tmppath}/%{name}-%{samba_version}-%{release}-root
-
 BuildRequires: avahi-devel
 BuildRequires: avahi-devel
 BuildRequires: bison
 BuildRequires: bison
 #BuildRequires: ctdb-devel
 #BuildRequires: ctdb-devel
@@ -1817,6 +1817,9 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.6-2
+- rebuilt with python-3.8.
+
 * Thu Aug 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.6-1
 * Thu Aug 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12.6-1
 - new upstream release.
 - new upstream release.
 
 

+ 19 - 13
s/seqdiag/seqdiag-vl.spec

@@ -1,27 +1,28 @@
 Summary: simple sequence-diagram image generator
 Summary: simple sequence-diagram image generator
 Summary(ja): シンプルなテキストからシーケンス図を生成するツール
 Summary(ja): シンプルなテキストからシーケンス図を生成するツール
 Name: seqdiag
 Name: seqdiag
-Version: 0.9.6
+Version: 2.0.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Applications/Text
+Group: graphics
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: iwaim
 
 
 License: Apache License 2.0
 License: Apache License 2.0
 URL: http://blockdiag.com/ja/seqdiag/
 URL: http://blockdiag.com/ja/seqdiag/
 Source0: https://pypi.python.org/packages/source/s/seqdiag/%{name}-%{version}.tar.gz
 Source0: https://pypi.python.org/packages/source/s/seqdiag/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 BuildArch: noarch
 BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 
+BuildRequires: python-rpm-macros
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
 BuildRequires: python-setuptools
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 Requires: python >= 2.4
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
 Requires: python(abi) = %pyver
 Requires: blockdiag
 Requires: blockdiag
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: iwaim
-
 %description
 %description
 seqdiag generate sequence-diagram image file from spec-text file.
 seqdiag generate sequence-diagram image file from spec-text file.
 
 
@@ -29,6 +30,7 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %package -n python3-seqdiag
 %package -n python3-seqdiag
 Summary: simple sequence-diagram image generator
 Summary: simple sequence-diagram image generator
 Summary(ja): シンプルなテキストからシーケンス図を生成するツール
 Summary(ja): シンプルなテキストからシーケンス図を生成するツール
+Group: graphics
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-setuptools
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-rpm-macros
@@ -43,12 +45,12 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %setup -q
 %setup -q
 
 
 %build
 %build
-%py_build
+%py2_build
 %py3_build
 %py3_build
 
 
 %install
 %install
 %__rm -rf %{buildroot}
 %__rm -rf %{buildroot}
-%py_install
+%py2_install
 %py3_install
 %py3_install
 
 
 %clean
 %clean
@@ -59,9 +61,9 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %license LICENSE
 %license LICENSE
 %doc examples README*
 %doc examples README*
 #%{_bindir}/seqdiag
 #%{_bindir}/seqdiag
-%{python_sitelib}/seqdiag-%{version}-py*.egg-info
-%{python_sitelib}/seqdiag
-%{python_sitelib}/seqdiag_sphinxhelper.*
+%{python2_sitelib}/seqdiag-%{version}-py*.egg-info
+%{python2_sitelib}/seqdiag
+%{python2_sitelib}/seqdiag_sphinxhelper.*
 
 
 %files -n python3-seqdiag
 %files -n python3-seqdiag
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
@@ -71,7 +73,11 @@ seqdiag generate sequence-diagram image file from spec-text file.
 %{python3_sitelib}/seqdiag*
 %{python3_sitelib}/seqdiag*
 %{python3_sitelib}/__pycache__/*
 %{python3_sitelib}/__pycache__/*
 
 
+
 %changelog
 %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.9.6-1
 * Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-1
 - new upstream release.
 - new upstream release.
 - added python3 support.
 - added python3 support.

+ 19 - 9
s/sip/sip-vl.spec

@@ -16,9 +16,11 @@
 Name:           sip
 Name:           sip
 Summary:        Python/C++ Bindings Generator
 Summary:        Python/C++ Bindings Generator
 Summary(ja):    Python/C++ インターフェイス生成ツール
 Summary(ja):    Python/C++ インターフェイス生成ツール
-Version:        4.19.19
+Version:        4.19.24
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Group:          Development/Tools
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
 # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison)
 # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison)
 License:        GPLv2 or GPLv3 and (GPLv3+ with exceptions)
 License:        GPLv2 or GPLv3 and (GPLv3+ with exceptions)
@@ -33,7 +35,6 @@ Source1: macros.sip
 
 
 Source10: sip-wrapper.sh
 Source10: sip-wrapper.sh
 
 
-
 ## upstreamable patches
 ## upstreamable patches
 # make install should not strip (by default), kills -debuginfo
 # make install should not strip (by default), kills -debuginfo
 Patch50: sip-4.18-no_strip.patch
 Patch50: sip-4.18-no_strip.patch
@@ -45,15 +46,13 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Provides: sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 
 
+BuildRequires:	python-rpm-macros
 BuildRequires:	python3-devel
 BuildRequires:	python3-devel
 BuildRequires:	python3-rpm-macros
 BuildRequires:	python3-rpm-macros
 BuildRequires:	python-devel
 BuildRequires:	python-devel
-BuildRequires:	python-rpm-macros
+BuildRequires:	python2-rpm-macros
 BuildRequires:	sed
 BuildRequires:	sed
 
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
 %description
 %description
 SIP is a tool for generating bindings for C++ classes so that they can be
 SIP is a tool for generating bindings for C++ classes so that they can be
 accessed as normal Python classes. SIP takes many of its ideas from SWIG but,
 accessed as normal Python classes. SIP takes many of its ideas from SWIG but,
@@ -69,7 +68,7 @@ class library.
 %package devel
 %package devel
 Summary: 	Files needed to generate Python bindings for any C++ class library
 Summary: 	Files needed to generate Python bindings for any C++ class library
 Summary(ja): 	Python/C++ インタフェース作成に必要なライブラリやヘッダファイル
 Summary(ja): 	Python/C++ インタフェース作成に必要なライブラリやヘッダファイル
-Group: 		Development/Libraries
+Group: 		programming
 Requires: 	%{name} = %{version}-%{release}
 Requires: 	%{name} = %{version}-%{release}
 Requires:	%{name}-macros = %{version}-%{release}
 Requires:	%{name}-macros = %{version}-%{release}
 Requires: 	python-devel
 Requires: 	python-devel
@@ -82,6 +81,7 @@ classes library.
 
 
 %package pyqt5-sip
 %package pyqt5-sip
 Summary: %summary
 Summary: %summary
+Group: 		programming
 Provides: python-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 Provides: python-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 %{?python_provide:%python_provide python-pyqt5-sip}
 %{?python_provide:%python_provide python-pyqt5-sip}
@@ -91,6 +91,7 @@ Provides: python-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 
 
 %package macros
 %package macros
 Summary: RPM macros for use when working with SIP
 Summary: RPM macros for use when working with SIP
+Group:   programming
 Requires: rpm
 Requires: rpm
 # when arch->noarch happened
 # when arch->noarch happened
 Obsoletes: sip-macros < 4.15.5
 Obsoletes: sip-macros < 4.15.5
@@ -103,6 +104,7 @@ It is used by both the sip-devel (python 2) and python3-sip-devel subpackages.
 
 
 %package -n python3-sip
 %package -n python3-sip
 Summary: SIP - Python 3/C++ Bindings Generator
 Summary: SIP - Python 3/C++ Bindings Generator
+Group: programming
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 Provides: python3-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python3-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python3-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 Provides: python3-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
@@ -123,6 +125,7 @@ class library.
 
 
 %package -n python3-sip-devel
 %package -n python3-sip-devel
 Summary: Files needed to generate Python 3 bindings for any C++ class library
 Summary: Files needed to generate Python 3 bindings for any C++ class library
+Group: programming
 Requires: %{name}-macros = %{version}-%{release}
 Requires: %{name}-macros = %{version}-%{release}
 Requires: python3-sip%{?_isa} = %{version}-%{release}
 Requires: python3-sip%{?_isa} = %{version}-%{release}
 Requires: python3-devel
 Requires: python3-devel
@@ -134,6 +137,7 @@ classes library.
 
 
 %package -n python3-pyqt5-sip
 %package -n python3-pyqt5-sip
 Summary: SIP - Python 3/C++ Bindings Generator for pyqt5
 Summary: SIP - Python 3/C++ Bindings Generator for pyqt5
+Group: programming
 BuildRequires: python3-devel
 BuildRequires: python3-devel
 Provides: python3-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python3-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api}
 Provides: python3-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 Provides: python3-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
@@ -141,6 +145,9 @@ Provides: python3-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api}
 This is the Python 3 build of pyqt5-SIP.
 This is the Python 3 build of pyqt5-SIP.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
@@ -187,7 +194,7 @@ mkdir %{_target_platform}-python3-pyqt5
 pushd %{_target_platform}-python3-pyqt5
 pushd %{_target_platform}-python3-pyqt5
 %{__python3} ../configure.py \
 %{__python3} ../configure.py \
   --sip-module=PyQt5.sip \
   --sip-module=PyQt5.sip \
-  -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \
+  -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \
   CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}"
   CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}"
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
@@ -275,6 +282,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.24-1
+- new upstream release.
+
 * Tue Oct 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.19-1
 * Tue Oct 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.19.19-1
 - new upstream release.
 - new upstream release.
 
 

+ 23 - 32
s/system-config-printer/system-config-printer-vl.spec

@@ -7,25 +7,19 @@
 Summary: A printer administration tool
 Summary: A printer administration tool
 Summary(ja): プリンタ管理ツール
 Summary(ja): プリンタ管理ツール
 Name: system-config-printer
 Name: system-config-printer
-Version: 1.5.11
+Version: 1.5.12
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+Group: admin-tools
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv2+
 License: GPLv2+
-URL: http://cyberelk.net/tim/software/system-config-printer/
-Group: System Environment/Base
-
-Source0: https://github.com/zdohnal/system-config-printer/releases/download/%{version}/system-config-printer-%{version}.tar.xz
-
-Patch01: system-config-printer-authdialog.patch
-Patch02: 0001-Use-ValueError-instead-of-ImportError-to-catch-excep.patch
-Patch03: 0001-Require-proper-version-of-GDK-and-GTK-in-scp-dbus-se.patch
-Patch04: 0001-Set-programe-name-for-scp-dbus-service-as-well.patch
-Patch05: 0001-require-Gtk-and-Gdk-version-3.0-in-asyncpk1.py.patch
-Patch06: 0001-encoding-Modified-to-use-utf-8-in-fdopen.patch
-Patch07: 0001-Fallback-to-using-LC_CTYPE-if-LC_MESSAGES-is-empty-a.patch
-Patch08: 0001-define-classes-for-Secret-only-when-libsecret-is-ins.patch
-Patch09: 0001-Fix-typo-in-debugprint-call-https-github.com-zdohnal.patch
-Patch10: 0001-Fix-TypeError-raised-by-debugprint-call.patch
-Patch11: 0001-dbus-remove-deprecated-at_console-statement.patch
+URL: https://github.com/OpenPrinting/system-config-printer
+Source0: https://github.com/OpenPrinting/system-config-printer/releases/download/%{version}/system-config-printer-%{version}.tar.xz
+
+# all upstream patches, remove with new release
+Patch01: 0001-udev-configure-printer-Add-checks-for-NULL.patch
+Patch02: system-config-printer-getchildren-removed.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -62,10 +56,12 @@ Provides: desktop-printing = 0.20-7.fc7
 system-config-printer is a graphical user interface that allows
 system-config-printer is a graphical user interface that allows
 the user to configure a CUPS print server.
 the user to configure a CUPS print server.
 
 
+
 %package libs
 %package libs
 Summary: Libraries and shared code for printer administration tool
 Summary: Libraries and shared code for printer administration tool
 Summary(ja): Libraries and shared code for printer administration tool
 Summary(ja): Libraries and shared code for printer administration tool
-Group: System Environment/Base
+Group: system
+BuildArch: noarch
 Requires: python3-cups >= 1.9.60
 Requires: python3-cups >= 1.9.60
 Requires: python3-pycurl
 Requires: python3-pycurl
 Requires: gobject-introspection
 Requires: gobject-introspection
@@ -74,16 +70,16 @@ Requires: gtk3
 Requires: dbus-python3
 Requires: dbus-python3
 Requires: python3-requests
 Requires: python3-requests
 Suggests: python3-smbc
 Suggests: python3-smbc
-BuildArch: noarch
 Obsoletes: %{name}-libs < 1.3.12-10
 Obsoletes: %{name}-libs < 1.3.12-10
 
 
 %description libs
 %description libs
 The common code used by both the graphical and non-graphical parts of
 The common code used by both the graphical and non-graphical parts of
 the configuration tool.
 the configuration tool.
 
 
+
 %package udev
 %package udev
 Summary: Rules for udev for automatic configuration of USB printers
 Summary: Rules for udev for automatic configuration of USB printers
-Group: System Environment/Base
+Group: system
 Requires: system-config-printer-libs = %{version}-%{release}
 Requires: system-config-printer-libs = %{version}-%{release}
 Obsoletes: hal-cups-utils <= 0.6.20
 Obsoletes: hal-cups-utils <= 0.6.20
 Provides: hal-cups-utils = 0.6.20
 Provides: hal-cups-utils = 0.6.20
@@ -92,21 +88,13 @@ Provides: hal-cups-utils = 0.6.20
 The udev rules and helper programs for automatically configuring USB
 The udev rules and helper programs for automatically configuring USB
 printers.
 printers.
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
-
 # all backported from upstream
 # all backported from upstream
-%patch01 -p1 -b .authdialog
-%patch02 -p1 -b .upstream0
-%patch03 -p1 -b .upstream1
-%patch04 -p1 -b .upstream2
-%patch05 -p1 -b .upstream3
-%patch06 -p1 -b .upstream4
-%patch07 -p1 -b .upstream5
-%patch08 -p1 -b .upstream6
-%patch09 -p1 -b .upstream7
-%patch10 -p1 -b .upstream8
-%patch11 -p1 -b .deprecate-at-console
+%patch01 -p1 -b .udev-configure-segfault
+%patch02 -p1 -b .getchildren-removed
+
 
 
 %build
 %build
 %configure --with-udev-rules
 %configure --with-udev-rules
@@ -169,6 +157,9 @@ rm -rf %buildroot
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 
 
 %changelog
 %changelog
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.12-1
+- new upstream release.
+
 * Thu Apr 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.11-1
 * Thu Apr 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.11-1
 - new upstream release.
 - new upstream release.
 - made to run with python3.
 - made to run with python3.

+ 14 - 8
t/tbb/tbb-vl.spec

@@ -3,16 +3,14 @@
 Name:           tbb
 Name:           tbb
 Summary:        The Threading Building Blocks library abstracts low-level threading details
 Summary:        The Threading Building Blocks library abstracts low-level threading details
 Summary(ja):    スレッド処理を抽象化するスレッディング・ビルディング・ブロックライブラリ
 Summary(ja):    スレッド処理を抽象化するスレッディング・ビルディング・ブロックライブラリ
-Version:        2020.2
+Version:        2020.3
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
-
 License:        ASL 2.0
 License:        ASL 2.0
 URL:            https://github.com/oneapi-src/oneTBB
 URL:            https://github.com/oneapi-src/oneTBB
-
 Source0:        https://github.com/intel/tbb/archive/v%{version}/%{name}-%{version}.tar.gz
 Source0:        https://github.com/intel/tbb/archive/v%{version}/%{name}-%{version}.tar.gz
 # These three are downstream sources.
 # These three are downstream sources.
 Source6:        tbb.pc
 Source6:        tbb.pc
@@ -62,7 +60,7 @@ maintenance is required as more processor cores become available.
 %package devel
 %package devel
 Summary: The Threading Building Blocks C++ headers and shared development libraries
 Summary: The Threading Building Blocks C++ headers and shared development libraries
 Summary(ja): TBBの C++ ヘッダファイルと開発用共有ライブラリ
 Summary(ja): TBBの C++ ヘッダファイルと開発用共有ライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 
 %description devel
 %description devel
@@ -73,7 +71,7 @@ Blocks (TBB) C++ libraries.
 %package doc
 %package doc
 Summary: The Threading Building Blocks documentation
 Summary: The Threading Building Blocks documentation
 Summary(ja): TBBのドキュメント
 Summary(ja): TBBのドキュメント
-Group: Documentation
+Group: documentation
 BuildArch: noarch
 BuildArch: noarch
 
 
 %description doc
 %description doc
@@ -89,6 +87,9 @@ Summary: Python 3 TBB module
 Python 3 TBB module.
 Python 3 TBB module.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %autosetup -p1 -n oneTBB-%{version}
 %autosetup -p1 -n oneTBB-%{version}
 
 
@@ -131,9 +132,10 @@ cp -p rml/libirml.so* .
 %py3_build
 %py3_build
 popd
 popd
 
 
+%ifnarch %{ix86}
 # Build the documentation
 # Build the documentation
 make doxygen
 make doxygen
-
+%endif
 
 
 %if %{with test}
 %if %{with test}
 %check
 %check
@@ -214,10 +216,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/tbb/
 %{_libdir}/cmake/tbb/
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/pkgconfig/*.pc
 
 
+%ifnarch %{ix86}
 %files doc
 %files doc
 %doc doc/Release_Notes.txt
 %doc doc/Release_Notes.txt
 %doc html
 %doc html
-
+%endif
 
 
 %files -n python3-%{name}
 %files -n python3-%{name}
 %doc python/index.html
 %doc python/index.html
@@ -227,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.3-1
+- new upstream release.
+
 * Tue Jun 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.2-1
 * Tue Jun 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2020.2-1
 - new upstream release.
 - new upstream release.
 
 

+ 28 - 15
w/wireshark/wireshark-vl.spec

@@ -4,11 +4,15 @@
 Summary: 	Network traffic analyzer
 Summary: 	Network traffic analyzer
 Summary(ja):    ネットワークトラフィック解析プログラム
 Summary(ja):    ネットワークトラフィック解析プログラム
 Name: 		wireshark
 Name: 		wireshark
-Version:	3.2.2
+Version:	3.2.6
 Release: 	1%{_dist_release}
 Release: 	1%{_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	inagaki
+
+Group: 		network,admin-tools
 License: 	GPLv2
 License: 	GPLv2
-Group: 		Applications/System
-URL: 		http://www.wireshark.org/
+URL: 		https://www.wireshark.org/
 Source0:	https://1.as.dl.wireshark.org/src/%{name}-%{version}.tar.xz
 Source0:	https://1.as.dl.wireshark.org/src/%{name}-%{version}.tar.xz
 Source1:	wireshark.pam
 Source1:	wireshark.pam
 Source2:	wireshark.console
 Source2:	wireshark.console
@@ -50,17 +54,13 @@ BuildRequires:	qt5-qtsvg-devel
 
 
 Requires:		%{name}-cli = %{version}-%{release}
 Requires:		%{name}-cli = %{version}-%{release}
 Requires:		usermode >= 1.37
 Requires:		usermode >= 1.37
-Requires(post):	desktop-file-utils
-Requires(postun): desktop-file-utils
+Requires(post):		desktop-file-utils
+Requires(postun):	desktop-file-utils
 
 
-Obsoletes:		ethereal
-Obsoletes:		ethereal-base ethereal-gnome ethereal-gtk+
-Obsoletes:		ethereal-kde ethereal-usermode
-Provides:		ethereal ethereal-gnome
-
-Vendor:			Project Vine
-Distribution:	Vine Linux
-Packager:		inagaki
+Obsoletes:	ethereal
+Obsoletes:	ethereal-base ethereal-gnome ethereal-gtk+
+Obsoletes:	ethereal-kde ethereal-usermode
+Provides:	ethereal ethereal-gnome
 
 
 %description
 %description
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
@@ -81,7 +81,7 @@ libpcap を使ったコマンドラインツールと,プラグイン,ドキ
 %package cli
 %package cli
 Summary:        Network traffic analyzer for CLI
 Summary:        Network traffic analyzer for CLI
 Summary(ja):    CLI用ネットワークトラフィック解析プログラム
 Summary(ja):    CLI用ネットワークトラフィック解析プログラム
-Group:          Applications/System
+Group:          network,admin-tools
 
 
 %description cli
 %description cli
 This package contains command-line utilities, plugins, and documentation for
 This package contains command-line utilities, plugins, and documentation for
@@ -95,7 +95,7 @@ Wireshark.
 %package devel
 %package devel
 Summary:        Development headers and libraries for wireshark
 Summary:        Development headers and libraries for wireshark
 Summary(ja):    wiresharkを用いた開発のためのヘッダ・ライブラリ
 Summary(ja):    wiresharkを用いた開発のためのヘッダ・ライブラリ
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release} glibc-devel glib2-devel
 Requires:       %{name} = %{version}-%{release} glibc-devel glib2-devel
 
 
 %description devel
 %description devel
@@ -103,9 +103,14 @@ The wireshark-devel package contains the header files, developer
 documentation, and libraries required for development of wireshark scripts
 documentation, and libraries required for development of wireshark scripts
 and plugins.
 and plugins.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %autosetup -S git
 %autosetup -S git
 
 
+
 %build
 %build
 %ifarch s390 s390x
 %ifarch s390 s390x
 export PIECFLAGS="-fPIE"
 export PIECFLAGS="-fPIE"
@@ -141,6 +146,7 @@ popd
 
 
 %ninja_build -C build
 %ninja_build -C build
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
@@ -198,9 +204,11 @@ mkdir -p html
 cp -f %{buildroot}%{_datadir}/doc/%{name}/* ./html/
 cp -f %{buildroot}%{_datadir}/doc/%{name}/* ./html/
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+
 %post
 %post
 update-desktop-database -q
 update-desktop-database -q
 
 
@@ -218,6 +226,7 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 %postun cli
 %postun cli
 /sbin/ldconfig
 /sbin/ldconfig
 
 
+
 %files
 %files
 %{_datadir}/appdata/wireshark.appdata.xml
 %{_datadir}/appdata/wireshark.appdata.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
@@ -286,7 +295,11 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 %{_libdir}/wireshark/cmake
 %{_libdir}/wireshark/cmake
 %{_libdir}/pkgconfig/%{name}.pc
 %{_libdir}/pkgconfig/%{name}.pc
 
 
+
 %changelog
 %changelog
+* Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.6-1
+- new upstream release.
+
 * Sat Mar 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.2-1
 * Sat Mar 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.2-1
 - new upstream release.
 - new upstream release.
 - updated patches.
 - updated patches.