Skip to content

Commit

Permalink
Remove /var/tmp workdir from rpm packaging
Browse files Browse the repository at this point in the history
tmt is creating the workdir by itself and as such does not need to have the directory being packaged as part of the rpm.
This change is in sync with Fedora Python packaging guidelines, harmonizing the rpm package with the PyPI package.
It also fixes the issue of the current implementation not using tmpfiles.d and as such is marked as forbidden by rpmlint Fedora configs.

Use /usr/bin/bash in redis test example.
  • Loading branch information
martinhoyer authored Apr 19, 2024
1 parent 033324a commit 6f82839
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion examples/redis/test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/bash

set -eux

Expand Down
4 changes: 0 additions & 4 deletions tmt.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Obsoletes: tmt-report-reportportal < %{version}-%{release}

Recommends: bash-completion

%define workdir_root /var/tmp/tmt

%py_provides python3-tmt

%description
Expand Down Expand Up @@ -126,7 +124,6 @@ mkdir -p %{buildroot}%{_mandir}/man1
install -pm 644 tmt.1 %{buildroot}%{_mandir}/man1
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
install -pm 644 completions/bash/%{name} %{buildroot}%{_datadir}/bash-completion/completions/%{name}
mkdir -pm 1777 %{buildroot}%{workdir_root}
mkdir -p %{buildroot}/etc/%{name}/
install -pm 644 %{name}/steps/provision/mrack/mrack* %{buildroot}/etc/%{name}/

Expand All @@ -137,7 +134,6 @@ install -pm 644 %{name}/steps/provision/mrack/mrack* %{buildroot}/etc/%{name}/
%doc README.rst examples
%{_bindir}/tmt
%{_mandir}/man1/tmt.1.gz
%dir %{workdir_root}
%{_datadir}/bash-completion/completions/%{name}

%files -n tmt+provision-container -f %{_pyproject_ghost_distinfo}
Expand Down

0 comments on commit 6f82839

Please sign in to comment.