Skip to content

Commit

Permalink
Merge pull request #782 from freedomofpress/backport-0.6.2-changes
Browse files Browse the repository at this point in the history
Backport 0.6.2 changes
  • Loading branch information
eaon authored Jun 9, 2022
2 parents 9b4f79a + 06efa27 commit f1f3a88
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.6.3-rc1
17 changes: 13 additions & 4 deletions rpm-build/SPECS/securedrop-workstation-dom0-config.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global srcname securedrop-workstation-dom0-config
%global version 0.6.0
%global version 0.6.3
%global __python3 /usr/bin/python3
%global python3_sitelib /usr/lib/%{_python_version}/site-packages
# For reproducible builds:
Expand All @@ -15,13 +15,13 @@

Name: %{srcname}
Version: %{version}
Release: 1%{?dist}
Release: 0.rc1.1%{?dist}
Summary: SecureDrop Workstation

Group: Library
License: GPLv3+
URL: https://github.com/freedomofpress/securedrop-workstation
Source0: securedrop-workstation-dom0-config-0.6.0.tar.gz
Source0: securedrop-workstation-dom0-config-0.6.3rc1.tar.gz

BuildArch: noarch
# Disable declaration of build dependencies, because
Expand Down Expand Up @@ -49,7 +49,7 @@ configuration over time.
%define use_source_date_epoch_as_buildtime 1

%prep
%setup -n securedrop-workstation-dom0-config-0.6.0
%setup -n securedrop-workstation-dom0-config-0.6.3rc1

%install
%{__python3} setup.py install --install-lib %{python3_sitelib} --no-compile --root %{buildroot}
Expand Down Expand Up @@ -133,6 +133,15 @@ find /srv/salt -maxdepth 1 -type f -iname '*.top' \
| xargs qubesctl top.enable > /dev/null

%changelog
* Thu Jun 8 2022 SecureDrop Team <[email protected]> - 0.6.3
- Add support for Qubes 4.1

* Thu Jun 2 2022 SecureDrop Team <[email protected]> - 0.6.2
- Use Fedora 35 base template (Qubes 4.0)

* Wed Jun 1 2022 SecureDrop Team <[email protected]> - 0.6.1
- Use Fedora 35 base template (Qubes 4.0)

* Thu Apr 7 2022 SecureDrop Team <[email protected]> - 0.6.0
- Check for network connection before running preflight updater (#743)
- Add option to launch updater from sdw-notify script (#740)
Expand Down

0 comments on commit f1f3a88

Please sign in to comment.