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
This commit is contained in:
Martin Pluskal 2023-05-27 07:45:27 +00:00 committed by Git OBS Bridge
parent 930d4fd36f
commit cc50dc7bfb
4 changed files with 8 additions and 10 deletions

2
.gitattributes vendored
View File

@ -21,5 +21,3 @@
*.xz filter=lfs diff=lfs merge=lfs -text *.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text
*.zst 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

View File

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

View File

@ -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> Wed May 10 01:42:06 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>

View File

@ -27,8 +27,6 @@ URL: https://github.com/facebook/zstd
Source0: https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz 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 Source1: https://github.com/facebook/zstd/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig
Source2: zstd.keyring 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 Source99: baselibs.conf
Patch1: pzstd.1.patch Patch1: pzstd.1.patch
BuildRequires: gcc BuildRequires: gcc
@ -125,7 +123,6 @@ export CXXFLAGS="%{optflags} -std=c++11"
%make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} %make_install V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir}
install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
install -D -m644 programs/zstd.1 %{buildroot}%{_mandir}/man1/pzstd.1 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}/gzip
ln -s zstd %{buildroot}/%{_bindir}/gunzip ln -s zstd %{buildroot}/%{_bindir}/gunzip
ln -s zstdcat %{buildroot}/%{_bindir}/zcat ln -s zstdcat %{buildroot}/%{_bindir}/zcat
@ -152,8 +149,6 @@ ln -s zstdcat %{buildroot}/%{_bindir}/zcat
%files -n lib%{name}-devel %files -n lib%{name}-devel
%license COPYING LICENSE %license COPYING LICENSE
%{_includedir}/*.h %{_includedir}/*.h
%dir %{_libdir}/cmake
%{_libdir}/cmake/zstd
%{_libdir}/pkgconfig/libzstd.pc %{_libdir}/pkgconfig/libzstd.pc
%{_libdir}/libzstd.so %{_libdir}/libzstd.so