Skip to content

Commit

Permalink
Updates for securedrop-update command and icon
Browse files Browse the repository at this point in the history
Also adds Makefile to the final package
  • Loading branch information
kushaldas committed Nov 1, 2018
1 parent 42aec59 commit 3475cc0
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
4 changes: 3 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
include dom0/*.sls
include dom0/*.top
include dom0/securedrop-update
include config.json.sample
include README.md
include LICENSE
inclue Makefile
include sd-svs/*
include sd-journalist/*
include sd-workstation/*
include sd-workstation/*
8 changes: 6 additions & 2 deletions rpm_spec/securedrop-workstation.spec
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,18 @@ install -m 755 -d %{buildroot}/srv
install -m 755 -d %{buildroot}/srv/salt/sd
install -m 755 -d %{buildroot}/srv/salt/sd/sd-svs
install -m 755 -d %{buildroot}/srv/salt/sd/sd-journalist
install -m 644 dom0/* %{buildroot}/srv/salt/
install -m 644 dom0/*.sls %{buildroot}/srv/salt/
install -m 644 dom0/*.top %{buildroot}/srv/salt/
install -m 755 dom0/securedrop-update %{buildroot}/usr/bin/securedrop-update
install sd-svs/* %{buildroot}/srv/salt/sd/sd-svs/
install sd-journalist/* %{buildroot}/srv/salt/sd/sd-journalist/

install -m 644 sd-journalist/logo-small.png %{buildroot}/usr/share/securedrop/icons/sd-logo.png
install -m 644 Makefile %{buildroot}/usr/share/%{name}/Makefile
%files
%doc README.md LICENSE
%{python3_sitelib}/securedrop_workstation*
%{_datadir}/%{name}
%{_bindir}/securedrop-update
/srv/salt/sd*
/srv/salt/fpf*

Expand Down
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@
license="GPLv3+",
python_requires=">=3.5",
url="https://github.com/freedomofpress/securdrop-workstation",
data_files = [("share/securedrop-workstation",["config.json.sample"])],
data_files=[
("share/securedrop-workstation", ["config.json.sample"]),
("bin/", ["dom0/securedrop-update"]),
],
classifiers=(
"Development Status :: 3 - Alpha",
"Programming Language :: Python :: 3",
"Topic :: Software Development :: Libraries :: Python Modules",
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"License :: OSI Approved :: "
"GNU General Public License v3 or later (GPLv3+)",
"Intended Audience :: Developers",
"Operating System :: OS Independent",
),
Expand Down

0 comments on commit 3475cc0

Please sign in to comment.