From 836550aa92078ead33b6185c6d03c554b71991fcb8b4e88dbb16201dc293b774 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Tue, 7 Jan 2020 17:34:51 +0000 Subject: [PATCH] Accepting request 761571 from home:scarabeus_iv:branches:security:forensics - Switch to build and distribution under python3 as py2 is obsolete OBS-URL: https://build.opensuse.org/request/show/761571 OBS-URL: https://build.opensuse.org/package/show/security:forensics/artifacts?expand=0&rev=11 --- artifacts.changes | 5 +++++ artifacts.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/artifacts.changes b/artifacts.changes index e3df3e7..5568cb4 100644 --- a/artifacts.changes +++ b/artifacts.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 7 12:16:02 UTC 2020 - Tomáš Chvátal + +- Switch to build and distribution under python3 as py2 is obsolete + ------------------------------------------------------------------- Thu Oct 17 13:37:02 UTC 2019 - Richard Brown diff --git a/artifacts.spec b/artifacts.spec index 59807b7..56c6f82 100644 --- a/artifacts.spec +++ b/artifacts.spec @@ -1,7 +1,7 @@ # # spec file for package artifacts # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,9 @@ Source0: https://github.com/ForensicArtifacts/artifacts/releases/download Source1: https://github.com/ForensicArtifacts/artifacts/releases/download/%{timestamp}/artifacts-%{timestamp}.tar.gz.asc # Key 0xD9625E5D7AD0177E by Joachim Metz https://github.com/joachimmetz Source2: %{name}.keyring +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: python3-setuptools BuildArch: noarch %description @@ -44,7 +47,6 @@ from the GRR team. %package validator Summary: Digital Forensics Artifact Repository Validator -BuildRequires: python-setuptools Requires: artifacts %description validator @@ -57,10 +59,11 @@ themselves and not use these Python modules. %setup -q -n artifacts-%{timestamp} %build -python setup.py build +%python3_build %install -python setup.py install --root=%{buildroot} --prefix=%{_prefix} +%python3_install +%fdupes %{buildroot}%{python3_sitelib} # these are installed to the wrong dir by %{name} rm %{buildroot}/usr/share/doc/%{name}/ACKNOWLEDGEMENTS rm %{buildroot}/usr/share/doc/%{name}/AUTHORS @@ -74,8 +77,7 @@ rm %{buildroot}/usr/share/doc/%{name}/README %files validator %license LICENSE -%{python_sitelib}/artifacts-%{timestamp}-py2.7.egg-info -%{python_sitelib}/artifacts +%{python3_sitelib}/artifacts* %{_bindir}/validator.py %{_bindir}/stats.py