Accepting request 566386 from home:scarabeus_iv:branches:X11:Wayland

It was broken before by bug in cmake, you know the things you might've known if
you would not just blindly revert it...

- Make sure to build just with python3
- Remove needles buildroot variable and default defattrs
- Use autopatch to apply patches

OBS-URL: https://build.opensuse.org/request/show/566386
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=19
This commit is contained in:
Jan Engelhardt 2018-01-16 21:49:25 +00:00 committed by Git OBS Bridge
parent 87796b7e6b
commit 4cacd628bf
2 changed files with 11 additions and 9 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jan 4 15:47:38 UTC 2018 - tchvatal@suse.com
- Make sure to build just with python3
- Remove needles buildroot variable and default defattrs
- Use autopatch to apply patches
-------------------------------------------------------------------
Fri Nov 17 13:32:51 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package spirv-tools
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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
@ -35,9 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison
BuildRequires: cmake >= 2.8.12
BuildRequires: gcc-c++
BuildRequires: python
BuildRequires: python-xml
BuildRequires: python3
BuildRequires: python3-base
BuildRequires: python3-xml
BuildRequires: spirv-headers >= 1.2
%description
@ -67,33 +66,29 @@ integration into other code bases directly.
%prep
%setup -q
%patch -P 1 -P 2 -p1
%autopatch -p1
%build
%cmake -D"SPIRV-Headers_SOURCE_DIR=%_prefix" -DSPIRV_BUILD_COMPRESSION=BOOL:ON
make %{?_smp_mflags}
%install
b="%buildroot"
%cmake_install
%post -n %lname -p /sbin/ldconfig
%postun -n %lname -p /sbin/ldconfig
%files
%defattr(-,root,root)
%_bindir/spirv-*
%doc LICENSE
%files -n %lname
%defattr(-,root,root)
%_libdir/libSPIRV-Tools.so.*
%_libdir/libSPIRV-Tools-comp.so.*
%_libdir/libSPIRV-Tools-link.so.*
%_libdir/libSPIRV-Tools-opt.so.*
%files devel
%defattr(-,root,root)
%_libdir/libSPIRV-Tools.so
%_libdir/libSPIRV-Tools-comp.so
%_libdir/libSPIRV-Tools-link.so