Changes for building fakeredis, Flor, pyparsing and xattr rpm (#1224)

data/presets.ini

@@ -29,7 +29,7 @@ projects: libbde,libcaes,libcdata,libcdatetime,libcdirectory,libcerror,libcfile,
 
 [plaso]
 presets: dfimagetools,redis-py
-projects: acstore,bencode,certifi,cffi,chardet,dateutil,defusedxml,fakeredis,Flor,future,libcaes,libesedb,libevt,libevtx,libexe,libfwps,libfwsi,liblnk,libmsiecf,libolecf,libscca,mock,opensearch-py,pbr,pefile,plaso,psutil,pyparsing,python-lz4,python-zstd,pytest-runner,pytz,pyzmq,requests,urllib3,XlsxWriter,yara-python
+projects: acstore,bencode,certifi,cffi,chardet,dateutil,defusedxml,fakeredis,Flor,future,libcaes,libesedb,libevt,libevtx,libexe,libfwps,libfwsi,liblnk,libmsiecf,libolecf,libscca,mock,opensearch-py,pbr,pefile,plaso,psutil,pyparsing,python-lz4,python-zstd,pytz,pyzmq,requests,urllib3,XlsxWriter,yara-python
 
 [redis-py]
 projects: deprecated,importlib-metadata,redis-py

data/projects.ini

@@ -414,12 +414,13 @@ description_long: Discover and load entry points from installed packages
 
 [fakeredis]
 version: >=1.1.0
-dpkg_build_dependencies: python3-poetry-core
+dpkg_build_dependencies: python3-poetry-core,python3-tox-current-env
 build_system: poetry
-maintainer: Bruce Merry <bmerry@ska.ac.za>
-homepage_url: https://github.com/jamesls/fakeredis
+rpm_template_spec: fakeredis.spec
+maintainer: Daniel Moran <daniel@moransoftware.ca>
+homepage_url: https://github.com/cunla/fakeredis-py
 download_url: https://pypi.org/project/fakeredis
-git_url: https://github.com/jamesls/fakeredis.git
+git_url: https://github.com/cunla/fakeredis-py.git
 description_short: A fake version of a redis-py
 description_long: Fake implementation of redis API (redis-py) for testing
     purposes
@@ -1739,6 +1740,7 @@ dpkg_build_dependencies: flit
 build_system: flit
 dpkg_name: python-pyparsing
 dpkg_template_install_python3: python3-pyparsing.install
+rpm_build_dependencies: python3-flit-core,python3-pip
 rpm_template_spec: pyparsing.spec
 maintainer: Paul McGuire <ptmcg@users.sourceforge.net>
 homepage_url: https://pyparsing-docs.readthedocs.io/en/latest
@@ -1762,25 +1764,6 @@ git_url: https://github.com/tobgu/pyrsistent.git
 description_short: Persistent/Functional/Immutable data structures
 description_long: Persistent/Functional/Immutable data structures
 
-[pytest-runner]
-version: >=1.0.1
-dpkg_name: python-pytest-runner
-dpkg_build_dependencies: python3-setuptools-scm
-dpkg_dependencies: python3-pytest
-dpkg_template_control: pytest-runner-control
-dpkg_template_install_python3: python3-pytest-runner.install
-rpm_build_dependencies: python3-setuptools_scm
-rpm_template_spec: pytest-runner.spec
-wheel_name: pytest_runner
-maintainer: Jason R. Coombs <jaraco@jaraco.com>
-homepage_url: https://github.com/pytest-dev/pytest-runner
-download_url: https://pypi.org/project/pytest-runner
-git_url: https://github.com/pytest-dev/pytest-runner.git
-description_short: Invoke py.test as distutils command with dependency
-    resolution
-description_long: Setup scripts can use pytest-runner to add setup.py test
-    support for pytest runner.
-
 [python-editor]
 version: >=1.0.1
 maintainer: Peter Ruibal <ruibalp@gmail.com>
@@ -2171,9 +2154,9 @@ architecture_dependent: true
 build_system: setuptools
 disabled: windows
 version: >=0.9.7
-dpkg_build_dependencies: python3-cffi,python3-toml,python3-wheel
+dpkg_build_dependencies: python3-cffi,python3-setuptools,python3-toml,python3-wheel
 dpkg_name: python-xattr
-rpm_build_dependencies: python3-cffi
+rpm_build_dependencies: python3-cffi,python3-pip,python3-setuptools,python3-tox-current-env,python3-wheel
 rpm_name: python-xattr
 rpm_template_spec: xattr.spec
 maintainer: John Machin <sjmachin@lexicon.net>

data/rpm_templates/Flor.spec

@@ -19,10 +19,10 @@ BuildRequires: python3-devel, python3-setuptools
 %description
 A Bloom filter implementation in Python
 
-%package -n python3-%{{name}}
+%package -n python3-flor
 Summary: Python 3 module of Flor - An efficient Bloom filter implementation in Python
 
-%description -n python3-%{{name}}
+%description -n python3-flor
 A Bloom filter implementation in Python
 
 %prep
@@ -39,9 +39,8 @@ rm -rf %{{buildroot}}/usr/share/doc/%{{name}}/
 %clean
 rm -rf %{{buildroot}}
 
-%files -n python3-%{{name}}
-
-
+%files -n python3-flor
+%doc README.md
 %{{python3_sitelib}}/flor
 %{{python3_sitelib}}/Flor*.egg-info
 

data/rpm_templates/fakeredis.spec

@@ -0,0 +1,44 @@
+%define name fakeredis
+%define version {version}
+%define release 1
+
+Name: %{{name}}
+Version: %{{version}}
+Release: %{{release}}
+Summary: A fake version of a redis-py
+License: BSD-3-Clause
+URL: https://github.com/cunla/fakeredis-py
+Source: %{{name}}-%{{version}}.tar.gz
+BuildArch: noarch
+BuildRequires: python3-devel, python3-poetry-core, python3-tox-current-env
+
+%description
+Fake implementation of redis API (redis-py) for testing purposes
+
+%package -n python3-%{{name}}
+Summary: A fake version of a redis-py
+
+%description -n python3-%{{name}}
+Fake implementation of redis API (redis-py) for testing purposes
+
+%prep
+%autosetup -p1 -n %{{name}}-%{{version}}
+
+# %generate_buildrequires
+# %pyproject_buildrequires -t
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+
+%files -n python3-%{{name}}
+%license LICENSE
+%doc README.md
+%{{python3_sitelib}}/fakeredis
+%{{python3_sitelib}}/fakeredis*.dist-info
+
+%changelog
+* {date_time} log2timeline development team <log2timeline-dev@googlegroups.com> {version}-1
+- Auto-generated

data/rpm_templates/pyparsing.spec

@@ -2,19 +2,16 @@
 %define version {version}
 %define release 1
 
-Summary: Python parsing module
 Name: %{{name}}
 Version: %{{version}}
 Release: %{{release}}
-Source0: %{{name}}-%{{version}}.tar.gz
 License: MIT License
-Group: Development/Libraries
-BuildRoot: %{{_tmppath}}/%{{name}}-%{{version}}-%{{release}}-buildroot
-Prefix: %{{_prefix}}
-BuildArch: noarch
-Vendor: Paul McGuire <ptmcg.gm+pyparsing@gmail.com>
+Summary: Python parsing module
 Url: https://github.com/pyparsing/pyparsing/
-BuildRequires: python3-devel, python3-setuptools
+Vendor: Paul McGuire <ptmcg.gm+pyparsing@gmail.com>
+Source0: %{{name}}-%{{version}}.tar.gz
+BuildArch: noarch
+BuildRequires: python3-devel, python3-flit-core, python3-pip, python3-setuptools
 
 %description
 The parsing module is an alternative approach to creating
@@ -34,26 +31,23 @@ of classes that client code uses to construct the grammar directly
 in Python code.
 
 %prep
-%autosetup -n %{{name}}-%{{version}}
+%autosetup -p1 -n %{{name}}-%{{version}}
+
+# This will try to include project.optional-dependencies
+# %generate_buildrequires
+# %pyproject_buildrequires -t
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
-rm -rf %{{buildroot}}/usr/lib/python*/site-packages/*.egg-info/requires.txt
-rm -rf %{{buildroot}}/usr/share/doc/%{{name}}/
-
-%clean
-rm -rf %{{buildroot}}
+%pyproject_install
 
 %files -n python3-%{{name}}
 %license LICENSE
 %doc CHANGES README.rst
 %{{python3_sitelib}}/pyparsing
-%{{python3_sitelib}}/pyparsing*.egg-info
-
-%exclude %{{python3_sitelib}}/__pycache__/
+%{{python3_sitelib}}/pyparsing*.dist-info
 
 %changelog
 * {date_time} log2timeline development team <log2timeline-dev@googlegroups.com> {version}-1

data/rpm_templates/xattr.spec

@@ -2,18 +2,15 @@
 %define version {version}
 %define release 1
 
-Summary: Python wrapper for extended filesystem attributes
 Name: %{{name}}
 Version: %{{version}}
 Release: %{{release}}
-Source0: %{{name}}-%{{version}}.tar.gz
+Summary: Python wrapper for extended filesystem attributes
 License: MIT License
-Group: Development/Libraries
-BuildRoot: %{{_tmppath}}/%{{name}}-%{{version}}-%{{release}}-buildroot
-Prefix: %{{_prefix}}
 Vendor: Bob Ippolito <bob@redivi.com>
 Url: http://github.com/xattr/xattr
-BuildRequires: gcc, python3-devel, python3-setuptools, python3-cffi
+Source0: %{{name}}-%{{version}}.tar.gz
+BuildRequires: gcc, python3-cffi, python3-devel, python3-pip, python3-setuptools, python3-tox-current-env, python3-wheel
 
 %description
 Extended attributes extend the basic attributes of files
@@ -23,10 +20,10 @@ Extended attributes are currently only available on Darwin 8.0+
 (Mac OS X 10.4) and Linux 2.6+. Experimental support is included for
 Solaris and FreeBSD.
 
-%package -n python3-py%{{name}}
+%package -n python3-%{{name}}
 Summary: Python 3 module of Python wrapper for extended filesystem attributes
 
-%description -n python3-py%{{name}}
+%description -n python3-%{{name}}
 Extended attributes extend the basic attributes of files
 and directories in the file system. They are stored as name:data pairs
 associated with file system objects (files, directories, symlinks, etc).
@@ -35,14 +32,18 @@ Extended attributes are currently only available on Darwin 8.0+
 Solaris and FreeBSD.
 
 %prep
-%autosetup -n %{{name}}-%{{version}}
+%autosetup -p1 -n %{{name}}-%{{version}}
+
+# The requirement versions are too recent for Fedora 39 but don't seem to
+# the necessary minimum versions.
+# %generate_buildrequires
+# %pyproject_buildrequires -t
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
-rm -rf %{{buildroot}}/usr/lib/python*/site-packages/*.egg-info/requires.txt
+%pyproject_install
 rm -rf %{{buildroot}}/usr/share/doc/%{{name}}/
 
 %clean
@@ -52,7 +53,7 @@ rm -rf %{{buildroot}}
 %license LICENSE.txt
 %doc CHANGES.txt
 %{{_libdir}}/python3*/site-packages/xattr
-%{{_libdir}}/python3*/site-packages/xattr*.egg-info
+%{{_libdir}}/python3*/site-packages/xattr*.dist-info
 
 %exclude %{{_bindir}}/xattr