From c039d134958ed655f5e61de099cb9e4345f3bae24ab06e6437080330c2a56d8c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 1 Nov 2017 13:47:00 +0000 Subject: [PATCH] Accepting request 538092 from home:pluskalm:branches:devel:tools:compiler - Switch to python3 OBS-URL: https://build.opensuse.org/request/show/538092 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/yasm?expand=0&rev=27 --- yasm.changes | 5 +++++ yasm.spec | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/yasm.changes b/yasm.changes index 77644ec..d563ea9 100644 --- a/yasm.changes +++ b/yasm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 1 13:45:33 UTC 2017 - mpluskal@suse.com + +- Switch to python3 + ------------------------------------------------------------------- Wed Jan 27 07:55:04 UTC 2016 - mpluskal@suse.com diff --git a/yasm.spec b/yasm.spec index 6fed0cc..044c1cb 100644 --- a/yasm.spec +++ b/yasm.spec @@ -1,7 +1,7 @@ # # spec file for package yasm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,14 @@ Name: yasm Version: 1.3.0 Release: 0 Summary: A complete rewrite of the NASM assembler -License: Artistic-1.0 and BSD-2-Clause and BSD-3-Clause and GPL-2.0+ and LGPL-2.0+ +License: Artistic-1.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0+ AND LGPL-2.0+ Group: Development/Languages/Other Url: http://www.tortall.net/projects/yasm/ Source: http://www.tortall.net/projects/yasm/releases/yasm-%{version}.tar.gz Patch0: %{name}-no-build-date.patch Patch1: %{name}-no-rpm-opt-flags.patch Patch2: yasm-re2c-nogendate.patch -BuildRequires: python-base -BuildRequires: xmlto -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python3-devel %description YASM is a complete rewrite of the NASM assembler. It is designed from @@ -59,10 +57,9 @@ libyasm. make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %check @@ -70,7 +67,6 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} make %{?_smp_mflags} check || true %files -%defattr(-,root,root) %doc Artistic.txt BSD.txt COPYING GNU_GPL-2.0 GNU_LGPL-2.0 %doc ABOUT-NLS AUTHORS %{_bindir}/vsyasm @@ -83,7 +79,6 @@ make %{?_smp_mflags} check || true %{_mandir}/man7/yasm_parsers.7%{ext_man} %files devel -%defattr(-,root,root) %{_includedir}/* %{_libdir}/libyasm.a