Fix failing RPM builds due to files ignored by Git

install/linux/build-rpm.py

@@ -51,6 +51,7 @@ def build(qubes=False):
         dist_path.mkdir()
 
     print(f"* Creating RPM project structure under {build_dir}")
+    build_dir.mkdir(exist_ok=True)
     for d in ["BUILD", "BUILDROOT", "RPMS", "SOURCES", "SPECS"]:
         subdir = build_dir / d
         subdir.mkdir(exist_ok=True)

install/linux/dangerzone.spec

@@ -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

pyproject.toml

@@ -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]