From cc50dc7bfb9cfbbb037bfa48a6fd6938c33439f349fd64872af40c04cef7333d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 27 May 2023 07:45:27 +0000 Subject: [PATCH] Accepting request 1089022 from home:bnavigator:branches:Archiving - Revert the addition of build specific cmake files: breaks gdal, apache-arrow and possibly others -- boo#1211566 * note that shipping cmake files is not intentional or supported upstream at the moment: gh#facebook/zstd#3642 OBS-URL: https://build.opensuse.org/request/show/1089022 OBS-URL: https://build.opensuse.org/package/show/Archiving/zstd?expand=0&rev=91 --- .gitattributes | 2 -- cmake.tar | 3 --- zstd.changes | 8 ++++++++ zstd.spec | 5 ----- 4 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 cmake.tar diff --git a/.gitattributes b/.gitattributes index 8d1e2f4..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.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 deleted file mode 100644 index 2412f4c..0000000 --- a/cmake.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6bc6de375cb3d76bfc86ced1fb54ddc12db73b57f80efe32610c95d007ed641d -size 20480 diff --git a/zstd.changes b/zstd.changes index 435dfa5..51ea54f 100644 --- a/zstd.changes +++ b/zstd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 25 11:41:00 UTC 2023 - Ben Greiner + +- Revert the addition of build specific cmake files: breaks + gdal, apache-arrow and possibly others -- boo#1211566 + * note that shipping cmake files is not intentional or supported + upstream at the moment: gh#facebook/zstd#3642 + ------------------------------------------------------------------- Wed May 10 01:42:06 UTC 2023 - Bernhard Wiedemann diff --git a/zstd.spec b/zstd.spec index 3a87c66..efc112f 100644 --- a/zstd.spec +++ b/zstd.spec @@ -27,8 +27,6 @@ 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 @@ -125,7 +123,6 @@ 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 @@ -152,8 +149,6 @@ 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