Skip to content

Commit

Permalink
Include data files only in source distribution
Browse files Browse the repository at this point in the history
Make Poetry include data files only in the source distribution, and not
on our wheels. This mainly makes RPM packaging a bit easier, but does
not solve the problem of how to install files to
`/usr/share/dangerzone`.

Also, include files using globs, which is the way Poetry prefers.

Fixes #678
Refs #677
  • Loading branch information
apyrgio committed Jan 23, 2024
1 parent 067e787 commit d854657
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
7 changes: 0 additions & 7 deletions install/linux/dangerzone.spec
Original file line number Diff line number Diff line change
Expand Up @@ -254,13 +254,6 @@ install -m 755 -d %{buildroot}/etc/qubes-rpc
install -m 755 qubes/* %{buildroot}/etc/qubes-rpc
%endif

# The following files are included in the top level of the Python source
# distribution, but they are moved in other places in the final RPM package.
# They are considered stale, so remove them to appease the RPM check that
# ensures there are no unhandled files.
rm %{buildroot}/%{python3_sitelib}/README.md
rm -r %{buildroot}%{python3_sitelib}/install

%files -f %{pyproject_files}
/usr/bin/dangerzone
/usr/bin/dangerzone-cli
Expand Down
9 changes: 5 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ version = "0.5.1"
description = "Take potentially dangerous PDFs, office documents, or images and convert them to safe PDFs"
authors = ["Freedom of the Press Foundation <[email protected]>", "Micah Lee <[email protected]>"]
license = "AGPL-3.0"
# NOTE: See also https://github.com/freedomofpress/dangerzone/issues/677
include = [
"share/",
"qubes/",
"install/linux/press.freedom.dangerzone.*",
"README.md"
{ path = "share/*", format = "sdist" },
{ path = "qubes/*", format = "sdist" },
{ path = "install/linux/press.freedom.dangerzone.*", format = "sdist" },
{ path = "README.md", format = "sdist" },
]

[tool.poetry.dependencies]
Expand Down

0 comments on commit d854657

Please sign in to comment.