From 83124a36b31359497fe2ebfb1d8f6b8f9970625c909ed382c0f4b53b2844887a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 Jan 2018 23:40:36 +0000 Subject: [PATCH 1/3] Accepting request 561689 from openSUSE:Factory:Staging:O - 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/561689 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=17 --- spirv-tools.changes | 7 +++++++ spirv-tools.spec | 13 ++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spirv-tools.changes b/spirv-tools.changes index 5ebd7eb..1da2a67 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -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 diff --git a/spirv-tools.spec b/spirv-tools.spec index eba55bb..9c1ef5f 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -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 From 87796b7e6b9ca2faf02ef1a5cfe4aaa1d1e6e0470fe75a9050633a8d153eaf95 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 5 Jan 2018 23:28:52 +0000 Subject: [PATCH 2/3] factory review for r17 was rejected (sr 561768) OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=18 --- spirv-tools.changes | 7 ------- spirv-tools.spec | 13 +++++++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/spirv-tools.changes b/spirv-tools.changes index 1da2a67..5ebd7eb 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/spirv-tools.spec b/spirv-tools.spec index 9c1ef5f..eba55bb 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -1,7 +1,7 @@ # # spec file for package spirv-tools # -# Copyright (c) 2018 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 @@ -35,8 +35,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: gcc-c++ -BuildRequires: python3-base -BuildRequires: python3-xml +BuildRequires: python +BuildRequires: python-xml +BuildRequires: python3 BuildRequires: spirv-headers >= 1.2 %description @@ -66,29 +67,33 @@ integration into other code bases directly. %prep %setup -q -%autopatch -p1 +%patch -P 1 -P 2 -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 From 4cacd628bf555583265e1af32224547668d8db3a11ddc26de127b037ee515c37 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Jan 2018 21:49:25 +0000 Subject: [PATCH 3/3] 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 --- spirv-tools.changes | 7 +++++++ spirv-tools.spec | 13 ++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spirv-tools.changes b/spirv-tools.changes index 5ebd7eb..1da2a67 100644 --- a/spirv-tools.changes +++ b/spirv-tools.changes @@ -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 diff --git a/spirv-tools.spec b/spirv-tools.spec index eba55bb..9c1ef5f 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -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