Browse Source

updated 3 packages

pyparsing-3.0.9-1

python-packaging-21.3-1

python-rpm-macros-3.11-1
Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
480f6484f2

+ 16 - 55
p/pyparsing/pyparsing-vl.spec

@@ -1,6 +1,6 @@
 Name:           pyparsing
-Version:        2.4.7
-Release:        2%{?_dist_release}
+Version:        3.0.9
+Release:        1%{?_dist_release}
 Summary:        An object-oriented approach to text processing
 Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
 Group:          programming
@@ -16,35 +16,21 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  python-rpm-macros
 
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-BuildRequires:  python2-rpm-macros
-
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-pip
+BuildRequires:  python3-flit
+BuildRequires:  dos2unix
 
 %description
 pyparsing is a module that can be used to easily and directly configure syntax
 definitions for any number of text parsing applications.
 
 
-%package -n python-pyparsing
-Summary:        An object-oriented approach to text processing
-Summary(ja):	オブジェクト指向のテキストパース用 Python モジュール
-Group:          programming
-Requires:       python
-Provides:       pyparsing = %{version}-%{release}
-Obsoletes:      pyparsing < %{version}
-
-%description -n python-pyparsing
-pyparsing is a module that can be used to easily and directly configure syntax
-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(ja):	オブジェクト指向のテキストパース用 Python モジュール
+Summary(ja):    オブジェクト指向のテキストパース用 Python モジュール
 Group:          programming
 Requires:       python3
 
@@ -54,58 +40,33 @@ definitions for any number of text parsing applications.
 
 
 %prep
-%setup -qc -n pyparsing-%{version}
-mv pyparsing-%{version} python2
-cp -a python2 python3
-
-pushd python2
-perl -pi -e 's/\r//' LICENSE
-perl -pi -e 's/\r//' CHANGES
-perl -pi -e 's/\r//' README*
-cp -a LICENSE CHANGES README* docs examples ../
-popd
+%setup -n pyparsing-%{version}
+dos2unix -k examples/*
 
 
 %build
-pushd python2
-%py2_build
-popd
-pushd python3
-%py3_build
-popd
-
+%pip3_build_wheel
 
 %install
-rm -rf $RPM_BUILD_ROOT
-pushd python2
-%py2_install
-popd
-pushd python3
-%py3_install
-popd
+%pip3_install_wheel
+#%{__python3} -m pip install -I --disable-pip-version-check --no-build-isolation --no-cache-dir --no-deps --no-clean --verbose --root %{buildroot} .
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n python-pyparsing
-%defattr(-,root,root,-)
-%license LICENSE
-%doc CHANGES README* docs examples
-%{python2_sitelib}/pyparsing*egg-info
-%{python2_sitelib}/pyparsing.py*
-
 %files -n python3-pyparsing
 %defattr(-,root,root,-)
 %license LICENSE
 %doc CHANGES README* docs examples
-%{python3_sitelib}/pyparsing*egg-info
-%{python3_sitelib}/pyparsing.py*
-%{python3_sitelib}/__pycache__/pyparsing.*
+%{python3_sitelib}/pyparsing*
 
 
 %changelog
+* Sat Oct 22 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.9-1
+- new upstream release.
+
 * Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.7-2
 - rebuilt with rpm-4.16.
 

+ 9 - 29
p/python-packaging/python-packaging-vl.spec

@@ -6,7 +6,7 @@
 
 Summary:        Core utilities for Python packages
 Name:           python-%{pypi_name}
-Version:        20.9
+Version:        21.3
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -15,20 +15,11 @@ 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
+Patch1:         python-packaging-dependency.patch
 
 BuildArch:      noarch
 
-# Dependencies with different names in Fedora and Epel7
 BuildRequires:  python-rpm-macros
-BuildRequires:  python2-rpm-macros
-BuildRequires:  python-setuptools
-BuildRequires:  python-devel
-BuildRequires:  python-pyparsing
-BuildRequires:  python-six
-%if %{with test}
-BuildRequires:  python-pytest
-BuildRequires:  python-pretend
-%endif
 
 # Build Python 3 subpackage only for Fedora
 %if 0%{?with_python3}
@@ -43,14 +34,11 @@ BuildRequires:  python3-pretend
 %endif
 %endif
 
-Requires:       python-pyparsing
-Requires:       python-six
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
 %description
 python-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
 
+
 %if 0%{?with_python3}
 %package -n python3-%{pypi_name}
 Summary:        %{summary}
@@ -65,40 +53,29 @@ dealing with versions, specifiers, markers etc.
 
 
 %prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
 
 %build
-%py_build
-
 %if 0%{?with_python3}
-%py3_build
+%pip3_build_wheel
 %endif
 
 
 %install
-%py_install
-
 %if 0%{?with_python3}
-%py3_install
+%pip3_install_wheel
 %endif
 
 
 %check
 %if %{with test}
-%{__python2} -m pytest tests/
 %{__python3} -m pytest tests/
 %endif
 
 
-%files
-%license LICENSE LICENSE.APACHE LICENSE.BSD
-%doc README.rst CHANGELOG.rst CONTRIBUTING.rst
-%{python2_sitelib}/%{pypi_name}/
-%{python2_sitelib}/%{pypi_name}-*-info/
-
 %if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
@@ -109,6 +86,9 @@ rm -rf %{pypi_name}.egg-info
 
 
 %changelog
+* Sun Oct 23 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 21.3-1
+- new upstream release.
+
 * Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 20.9-1
 - new upstream release.
 

+ 6 - 8
p/python-rpm-macros/python-rpm-macros-vl.spec

@@ -1,7 +1,7 @@
 Name:           python-rpm-macros
 Summary:        The unversioned Python RPM macros
-Version:        3.8
-Release:        2%{?_dist_release}
+Version:        3.11
+Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -17,8 +17,6 @@ Source4:        macros.platform-python
 Source100:      python.attr
 Source101:      pythondist.attr
 Source102:      pythondistdeps.py
-# for apt (rich operators of dependencies are not supported)
-Patch1000:      pythondistdeps.py-downgrade.patch
 
 BuildArch:      noarch
 # For %%python3_pkgversion used in %%python_provide
@@ -59,6 +57,7 @@ Summary:        RPM macros for building Python 3 packages
 #Conflicts:      python3-devel < 3.5.1-3
 Requires:       python-rpm-macros
 Requires:       python-srpm-macros
+Requires:       python3-pip
 
 %description -n python3-rpm-macros
 RPM macros for building Python 3 packages.
@@ -74,7 +73,6 @@ RPM macros for building Python 3 packages.
 %prep
 %setup -T -c
 cp -f %{SOURCE102} ./
-%patch1000 -p0
 
 
 %build
@@ -93,9 +91,6 @@ mkdir -p %{buildroot}%{_rpmconfigdir}
 install -m 755 pythondistdeps.py \
   %{buildroot}%{_rpmconfigdir}/
 
-sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python3|' \
-  %{buildroot}%{_rpmconfigdir}/pythondistdeps.py
-
 
 %files
 %{_rpmmacrodir}/macros.python
@@ -117,6 +112,9 @@ sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python3|' \
 
 
 %changelog
+* Sun Oct 23 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.11-1
+- built with python-3.11.
+
 * Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.8-2
 - added scripts.