.gitignore

@@ -1 +1 @@
-SOURCES/zstd-1.5.0.tar.gz
+SOURCES/zstd-1.4.4.tar.gz

.zstd.metadata

@@ -1 +1 @@
-c53019729e3a595f0104facab6533d78296a2945 SOURCES/zstd-1.5.0.tar.gz
+8ec1a47b704001c1804b8670a3c86f4baf035c07 SOURCES/zstd-1.4.4.tar.gz

SOURCES/pzstd.1.patch

@@ -1,10 +1,11 @@
-diff -Naur zstd-1.4.7.orig/programs/zstd.1 zstd-1.4.7/programs/zstd.1
+diff -Naur -Naru zstd-1.3.4/programs/zstd.1 zstd-1.3.4.new/programs/zstd.1
---- zstd-1.4.7.orig/programs/zstd.1	2020-12-16 23:00:18.000000000 +0000
+--- zstd-1.3.4/programs/zstd.1	2018-03-26 22:19:34.000000000 +0000
-+++ zstd-1.4.7/programs/zstd.1	2020-12-17 15:15:22.586152398 +0000
++++ zstd-1.3.4.new/programs/zstd.1	2018-03-28 04:28:27.532777239 +0000
-@@ -208,6 +208,14 @@
+@@ -177,7 +177,14 @@
  .
- .IP "\(bu" 4
+ .SS "Restricted usage of Environment Variables"
- \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files
+ Using environment variables to set parameters has security implications\. Therefore, this avenue is intentionally restricted\. Only \fBZSTD_CLEVEL\fR is supported currently, for setting compression level\. \fBZSTD_CLEVEL\fR can be used to set the level between 1 and 19 (the "normal" range)\. If the value of \fBZSTD_CLEVEL\fR is not a valid integer, it will be ignored with a warning message\. \fBZSTD_CLEVEL\fR just replaces the default compression level (\fB3\fR)\. It can be overridden by corresponding command line arguments\.
+-.
 +
 +.SH Parallel Zstd OPTIONS
 +Additional options for the pzstd utility
@@ -13,6 +14,6 @@ diff -Naur zstd-1.4.7.orig/programs/zstd.1 zstd-1.4.7/programs/zstd.1
 + number of threads to use for (de)compression (default:4)
 +
 +
- .
+ .SH "DICTIONARY BUILDER"
- .IP "" 0
+ \fBzstd\fR offers \fIdictionary\fR compression, which greatly improves efficiency on small files and messages\. It\'s possible to train \fBzstd\fR with a set of samples, the result of which is saved into a file called a \fBdictionary\fR\. Then during compression and decompression, reference the same dictionary, using command \fB\-D dictionaryFileName\fR\. Compression of small files similar to the sample set will be greatly improved\.
  .

SPECS/zstd.spec

@@ -11,12 +11,9 @@
 %endif
 %endif
 
-# Disable gtest
-%bcond_with gtest
-
 Name:           zstd
-Version:        1.5.0
+Version:        1.4.4
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Zstd compression library
 
 License:        BSD and GPLv2
@@ -25,11 +22,7 @@ Source0:        https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{n
 
 Patch1:         pzstd.1.patch
 
-BuildRequires: make
+BuildRequires:  gcc gtest-devel
-BuildRequires:  gcc
-%if %{with gtest}
-BuildRequires: gtest-devel
-%endif
 %if %{with pzstd}
 BuildRequires:  gcc-c++
 %endif
@@ -48,15 +41,9 @@ Zstandard compression shared library.
 Summary:        Header files for Zstd library
 Requires:       lib%{name}%{?_isa} = %{version}-%{release}
 
-%package -n lib%{name}-static
-Summary:        Static variant of the Zstd library
-Requires:       lib%{name}-devel = %{version}-%{release}
-
 %description -n lib%{name}-devel
 Header files for Zstd library.
 
-%description -n lib%{name}-static
-Static variant of the Zstd library.
 
 %prep
 %setup -q
@@ -68,10 +55,11 @@ find -name .gitignore -delete
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
-%make_build -C lib lib-mt
+for dir in lib programs; do
-%make_build -C programs
+  %make_build -C "$dir"
+done
 %if %{with pzstd}
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
 %make_build -C contrib/pzstd
 %endif
 
@@ -80,14 +68,14 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
 make -C tests test-zstd
 %if %{with pzstd}
-%if %{with gtest}
+export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
-export CXXFLAGS="$RPM_OPT_FLAGS"
 make -C contrib/pzstd test
 %endif
-%endif
 
 %install
 %make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
+# Don't install the static lib
+rm %{buildroot}%{_libdir}/libzstd.a
 %if %{with pzstd}
 install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
 install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
@@ -117,65 +105,25 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
 %license COPYING LICENSE
 
 %files -n lib%{name}-devel
+%{_includedir}/zbuff.h
 %{_includedir}/zdict.h
 %{_includedir}/zstd.h
 %{_includedir}/zstd_errors.h
 %{_libdir}/pkgconfig/libzstd.pc
 %{_libdir}/libzstd.so
 
-%files -n lib%{name}-static
-%{_libdir}/libzstd.a
-
 %ldconfig_scriptlets -n lib%{name}
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-2
+* Thu Jun 4 2020 Jakub Martisko <jamartis@redhat.com> - 1.4.4-1
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebase to 1.4.4
-  Related: rhbz#1991688
+Resolvese: 1807452
 
-* Mon Jul 12 2021 Jakub Martisko <jamartis@redhat.com> - 1.5.0-1
+* Tue Oct 15 2019 Jakub Martisko <jamartis@redhat.com> - 1.4.2-2
-* Rebase to the latest usptream version
+- Add some basic gating tests
-Resolves: rhbz#1928094
 
-* Thu Jul 01 2021 Jakub Martisko <jamartis@redhat.com> - 1.4.9-3
+* Tue Oct 15 2019 Jakub Martisko <jamartis@redhat.com> - 1.4.2-1
-- Drop gtest-devel dependency
+- Initial rhel commit
-Resolves: rhbz#1977606
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.9-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Fri Mar 05 2021 Pádraig Brady <P@draigBrady.com> - 1.4.9-1
-- Latest upstream
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Dec 17 2020 Pádraig Brady <P@draigBrady.com> - 1.4.7-1
-- Latest upstream
-
-* Wed Aug 26 2020 Jeff Law <law@redhat.com> - 1.4.5-6
-- Do not force C++11 mode
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.4.5-4
-- Build libzstd with multi-threading support
-
-* Mon May 25 2020 Pádraig Brady <P@draigBrady.com> - 1.4.5-3
-- Build shared library with correct compiler flags
-
-* Fri May 22 2020 Pádraig Brady <P@draigBrady.com> - 1.4.5-1
-- Latest upstream
-
-* Fri May 22 2020 Avi Kivity <avi@scylladb.com> - 1.4.4-3
-- Added static library subpackage
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 15 2020 Pádraig Brady <P@draigBrady.com> - 1.4.4-1
-- Latest upstream
 
 * Wed Jul 31 2019 Pádraig Brady <P@draigBrady.com> - 1.4.2-1
 - Latest upstream