diff --git a/.zstd.metadata b/.zstd.metadata index 877daa1..bde4a88 100644 --- a/.zstd.metadata +++ b/.zstd.metadata @@ -1 +1 @@ -8ec1a47b704001c1804b8670a3c86f4baf035c07 SOURCES/zstd-1.4.4.tar.gz +8059ef26c3d7dffa4d6dad64511c0675e46c0da6 SOURCES/zstd-1.4.5.tar.gz diff --git a/SOURCES/lib-make.patch b/SOURCES/lib-make.patch new file mode 100644 index 0000000..2bbe9cf --- /dev/null +++ b/SOURCES/lib-make.patch @@ -0,0 +1,20 @@ +diff -Naur zstd-1.4.5.orig/lib/Makefile zstd-1.4.5/lib/Makefile +--- zstd-1.4.5.orig/lib/Makefile 2020-05-22 05:04:00.000000000 +0000 ++++ zstd-1.4.5/lib/Makefile 2020-05-25 14:11:28.947300726 +0000 +@@ -220,13 +220,14 @@ + .PHONY: lib + lib : libzstd.a libzstd + +-.PHONY: lib-mt ++# note : do not define lib-mt or lib-release as .PHONY ++# make does not consider implicit pattern rule for .PHONY target ++ + %-mt : CPPFLAGS += -DZSTD_MULTITHREAD + %-mt : LDFLAGS += -pthread + %-mt : % + @echo multi-threading build completed + +-.PHONY: lib-release + %-release : DEBUGFLAGS := + %-release : % + @echo release build completed diff --git a/SOURCES/pzstd.1.patch b/SOURCES/pzstd.1.patch index bb03404..d6d0ee7 100644 --- a/SOURCES/pzstd.1.patch +++ b/SOURCES/pzstd.1.patch @@ -1,11 +1,10 @@ -diff -Naur -Naru zstd-1.3.4/programs/zstd.1 zstd-1.3.4.new/programs/zstd.1 ---- zstd-1.3.4/programs/zstd.1 2018-03-26 22:19:34.000000000 +0000 -+++ zstd-1.3.4.new/programs/zstd.1 2018-03-28 04:28:27.532777239 +0000 -@@ -177,7 +177,14 @@ +diff -Naur zstd-1.4.5.orig/programs/zstd.1 zstd-1.4.5/programs/zstd.1 +--- zstd-1.4.5.orig/programs/zstd.1 2020-05-22 05:04:00.000000000 +0000 ++++ zstd-1.4.5/programs/zstd.1 2020-05-22 13:01:37.443798417 +0000 +@@ -202,6 +202,14 @@ . - .SS "Restricted usage of Environment Variables" - 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\. --. + .IP "\(bu" 4 + \fB\-\-\fR: All arguments after \fB\-\-\fR are treated as files + +.SH Parallel Zstd OPTIONS +Additional options for the pzstd utility @@ -14,6 +13,6 @@ diff -Naur -Naru zstd-1.3.4/programs/zstd.1 zstd-1.3.4.new/programs/zstd.1 + number of threads to use for (de)compression (default:4) + + - .SH "DICTIONARY BUILDER" - \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\. + . + .IP "" 0 . diff --git a/SPECS/zstd.spec b/SPECS/zstd.spec index 32c5bd1..ecd6b4a 100644 --- a/SPECS/zstd.spec +++ b/SPECS/zstd.spec @@ -12,8 +12,8 @@ %endif Name: zstd -Version: 1.4.4 -Release: 1%{?dist} +Version: 1.4.5 +Release: 6%{?dist} Summary: Zstd compression library License: BSD and GPLv2 @@ -21,6 +21,7 @@ URL: https://github.com/facebook/zstd Source0: https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1: pzstd.1.patch +Patch2: lib-make.patch BuildRequires: gcc gtest-devel %if %{with pzstd} @@ -41,9 +42,15 @@ 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 @@ -51,15 +58,15 @@ find -name .gitignore -delete %if %{with pzstd} %patch1 -p1 %endif +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" -for dir in lib programs; do - %make_build -C "$dir" -done +%make_build -C lib lib-mt +%make_build -C programs %if %{with pzstd} -export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11" +export CXXFLAGS="$RPM_OPT_FLAGS" %make_build -C contrib/pzstd %endif @@ -68,14 +75,12 @@ export CFLAGS="$RPM_OPT_FLAGS" export LDFLAGS="$RPM_LD_FLAGS" make -C tests test-zstd %if %{with pzstd} -export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11" +export CXXFLAGS="$RPM_OPT_FLAGS" make -C contrib/pzstd test %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 @@ -112,18 +117,35 @@ install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1 %{_libdir}/pkgconfig/libzstd.pc %{_libdir}/libzstd.so +%files -n lib%{name}-static +%{_libdir}/libzstd.a + %ldconfig_scriptlets -n lib%{name} %changelog -* Thu Jun 4 2020 Jakub Martisko - 1.4.4-1 -- Rebase to 1.4.4 -Resolvese: 1807452 +* Wed Aug 26 2020 Jeff Law - 1.4.5-6 +- Do not force C++11 mode + +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Tue Oct 15 2019 Jakub Martisko - 1.4.2-2 -- Add some basic gating tests +* Sat Jul 11 2020 Igor Raits - 1.4.5-4 +- Build libzstd with multi-threading support -* Tue Oct 15 2019 Jakub Martisko - 1.4.2-1 -- Initial rhel commit +* Mon May 25 2020 Pádraig Brady - 1.4.5-3 +- Build shared library with correct compiler flags + +* Fri May 22 2020 Pádraig Brady - 1.4.5-1 +- Latest upstream + +* Fri May 22 2020 Avi Kivity - 1.4.4-3 +- Added static library subpackage + +* Fri Jan 31 2020 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 15 2020 Pádraig Brady - 1.4.4-1 +- Latest upstream * Wed Jul 31 2019 Pádraig Brady - 1.4.2-1 - Latest upstream