From 930d4fd36ff9b468283186384a1f30d16c1c52b522f8d2cadeed82ee01f5ae6e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 10 May 2023 07:48:44 +0000 Subject: [PATCH] Accepting request 1085993 from home:bmwiedemann:branches:Archiving document where cmake.tar came from Add cmake files manually because we do not want to add cmake to the bootstrap ring0 OBS-URL: https://build.opensuse.org/request/show/1085993 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=89 --- .gitattributes | 2 ++ cmake.tar | 3 +++ zstd.changes | 6 ++++++ zstd.spec | 5 +++++ 4 files changed, 16 insertions(+) create mode 100644 cmake.tar diff --git a/.gitattributes b/.gitattributes index 9b03811..8d1e2f4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +cmake.tar filter=lfs diff=lfs merge=lfs -text diff --git a/cmake.tar b/cmake.tar new file mode 100644 index 0000000..2412f4c --- /dev/null +++ b/cmake.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bc6de375cb3d76bfc86ced1fb54ddc12db73b57f80efe32610c95d007ed641d +size 20480 diff --git a/zstd.changes b/zstd.changes index c29a34b..435dfa5 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 10 01:42:06 UTC 2023 - Bernhard Wiedemann + +- Add cmake files manually because we do not want to add + cmake to the bootstrap ring0 + ------------------------------------------------------------------- Thu Apr 13 11:15:39 UTC 2023 - Dirk Müller diff --git a/zstd.spec b/zstd.spec index efc112f..3a87c66 100644 --- a/zstd.spec +++ b/zstd.spec @@ -27,6 +27,8 @@ URL: https://github.com/facebook/zstd Source0: https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig Source2: zstd.keyring +# cmake.tar contains files created by cmake in https://build.opensuse.org/package/show/Archiving/zstd?rev=86 that are needed by pcsx2 cmake build +Source3: cmake.tar Source99: baselibs.conf Patch1: pzstd.1.patch BuildRequires: gcc @@ -123,6 +125,7 @@ export CXXFLAGS="%{optflags} -std=c++11" %make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 +tar -C %{buildroot}/%{_libdir} -xf %{SOURCE3} ln -s zstd %{buildroot}/%{_bindir}/gzip ln -s zstd %{buildroot}/%{_bindir}/gunzip ln -s zstdcat %{buildroot}/%{_bindir}/zcat @@ -149,6 +152,8 @@ ln -s zstdcat %{buildroot}/%{_bindir}/zcat %files -n lib%{name}-devel %license COPYING LICENSE %{_includedir}/*.h +%dir %{_libdir}/cmake +%{_libdir}/cmake/zstd %{_libdir}/pkgconfig/libzstd.pc %{_libdir}/libzstd.so