Merge remote-tracking branch 'origin/upstreams/develop' into merge

delphix · Sep 25, 2024 · 8b80432 · 8b80432
2 parents 5ec2aff + ad9b241
commit 8b80432
Show file tree

Hide file tree

Showing 35 changed files with 2,310 additions and 155 deletions.
diff --git a/.packit.yaml b/.packit.yaml
@@ -10,8 +10,8 @@ upstream_package_name: drgn
 downstream_package_name: python-drgn
 actions:
   get-current-version: "python3 setup.py --version"
-  # Fetch the specfile from Rawhide, drop any patches and disable rpmautospec
-  post-upstream-clone: "bash -c \"curl -s https://src.fedoraproject.org/rpms/python-drgn/raw/main/f/python-drgn.spec | sed -e '/^Patch[0-9]/d' -e '/^%autochangelog$/d' > python-drgn.spec\""
+  # Fetch the specfile from Rawhide, drop any patches, disable rpmautospec, and add the _drgn_util package
+  post-upstream-clone: "bash -c \"curl -s https://src.fedoraproject.org/rpms/python-drgn/raw/main/f/python-drgn.spec | sed -e '/^Patch[0-9]/d' -e '/^%autochangelog$/d' -e 's!^%{python3_sitearch}/%{pypi_name}$!%{python3_sitearch}/%{pypi_name}\\\\n%{python3_sitearch}/_%{pypi_name}_util!' > python-drgn.spec\""
 
 srpm_build_deps:
   - bash