Accepting request 1089288 from Archiving

OBS-URL: https://build.opensuse.org/request/show/1089288
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zstd?expand=0&rev=34

.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

cmake.tar

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bc6de375cb3d76bfc86ced1fb54ddc12db73b57f80efe32610c95d007ed641d
-size 20480

zstd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 25 11:41:00 UTC 2023 - Ben Greiner <code@bnavigator.de>
+
+- 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 <bwiedemann@suse.com>
 

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