diff --git a/DirectX-Headers-rpmlintrc b/DirectX-Headers-rpmlintrc index 2fa2028..8da242e 100644 --- a/DirectX-Headers-rpmlintrc +++ b/DirectX-Headers-rpmlintrc @@ -1,4 +1,3 @@ -# This allows '/usr/lib64/libDirectX-Guids.a' to be included: +# happens irrespective of LTO addFilter("lto-no-text-in-archive .*"); addFilter("devel-file-in-non-devel-package .*"); -addFilter("files-duplicate /usr/include/wsl/stubs/rpc.h /usr/include/wsl/stubs/OAIdl.h:/usr/include/wsl/stubs/OCIdl.h"); diff --git a/DirectX-Headers.changes b/DirectX-Headers.changes index fef755f..9e71a9d 100644 --- a/DirectX-Headers.changes +++ b/DirectX-Headers.changes @@ -1,7 +1,17 @@ +------------------------------------------------------------------- +Wed May 25 16:20:53 UTC 2022 - Callum Farmer + +- Clean spec file + * Fix description + * Use %autosetup + * Use meson macros + * Use fdupes for duplicate files + * Use a better URL + ------------------------------------------------------------------- Wed May 25 13:28:44 UTC 2022 - Stefan Dirsch -- added missing %channgelog section to specfile +- added missing %changelog section to specfile ------------------------------------------------------------------- Wed May 25 12:25:12 UTC 2022 - Stefan Dirsch diff --git a/DirectX-Headers.spec b/DirectX-Headers.spec index 9fc639f..32daba4 100644 --- a/DirectX-Headers.spec +++ b/DirectX-Headers.spec @@ -14,46 +14,42 @@ # # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: DirectX-Headers Version: 1.600.10 Release: 0 Summary: DirectX Headers for Mesa License: MIT URL: https://github.com/microsoft/DirectX-Headers -### osc service runall download_files -Source: https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -##### +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-rpmlintrc BuildRequires: gcc-c++ BuildRequires: meson +BuildRequires: fdupes ExclusiveArch: %{ix86} x86_64 -%define _lto_cflags %{nil} - %description -This repository hosts the official Direct3D 12 headers. These headers are made available under the MIT license rather than the traditional Windows SDK license. Additionally, this repository hosts several helpers for using these headers. Make sure that you visit the DirectX Landing Page for more resources for DirectX developers. +This package contains the official Direct3D 12 headers. +These headers are made available under the MIT license rather than the traditional Windows SDK license. +Additionally, this package hosts several helpers for using these headers. +Make sure that you visit the DirectX Landing Page for more resources for DirectX developers. %prep -%setup +%autosetup %build -CXXFLAGS="$CXXFLAGS -fno-lto" meson . build -Dbuild-test=false --prefix /usr -ninja -C build +%global _lto_cflags %{nil} +%meson -Dbuild-test=false +%meson_build %install -%if 0%{?suse_version} > 1500 -meson install -C build --destdir "%{buildroot}" -%else -DESTDIR="%{buildroot}" meson install -C build -%endif +%meson_install +%fdupes -s %{buildroot} %files -%dir /usr/include/directx -%dir /usr/include/dxguids -%dir /usr/include/wsl -/usr/include/directx/* -/usr/include/dxguids/* -/usr/include/wsl/* +%{_includedir}/directx +%{_includedir}/dxguids +%{_includedir}/wsl %{_libdir}/pkgconfig/DirectX-Headers.pc %{_libdir}/libDirectX-Guids.a