The package rpms/zstd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/zstd.git/commit/?id=9f8104bc8a73a....
Change:
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 21908004d06eafd1380e1f4fa3031e6b5fb704be
Author: Pádraig Brady <P(a)draigBrady.com>
Date: Tue Mar 27 22:05:46 2018 -0700
latest upstream (1.3.4)
diff --git a/.gitignore b/.gitignore
index 6dff472..c52bd79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/zstd-1.3.1.tar.gz
/zstd-1.3.2.tar.gz
/zstd-1.3.3.tar.gz
+/zstd-1.3.4.tar.gz
diff --git a/pzstd.1.patch b/pzstd.1.patch
index 1f391b4..cfe2e45 100644
--- a/pzstd.1.patch
+++ b/pzstd.1.patch
@@ -1,7 +1,7 @@
-diff -Naur zstd-1.2.0.orig/programs/zstd.1 zstd-1.2.0/programs/zstd.1
---- zstd-1.2.0.orig/programs/zstd.1 2017-05-04 18:18:24.000000000 +0000
-+++ zstd-1.2.0/programs/zstd.1 2017-05-08 13:26:25.639811525 +0000
-@@ -162,7 +162,14 @@
+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 @@
.TP
\fB\-\-\fR
All arguments after \fB\-\-\fR are treated as files
@@ -15,5 +15,5 @@ diff -Naur zstd-1.2.0.orig/programs/zstd.1 zstd-1.2.0/programs/zstd.1
+
+
.SH "DICTIONARY BUILDER"
- \fBzstd\fR offers \fIdictionary\fR compression, useful for very small files and
messages\. It\'s possible to train \fBzstd\fR with some samples, the result of which
is saved into a file called a \fBdictionary\fR\. Then during compression and
decompression, reference the same dictionary\. It will improve compression ratio of small
files\. Typical gains range from 10% (at 64KB) to x5 better (at <1KB)\.
+ \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\.
.
diff --git a/sources b/sources
index 06624ee..a7e15cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zstd-1.3.3.tar.gz) =
72b63f96f65ca987cdc82c24354f7665c7dc3b2563cb0646f355c34bf8f090d8a0759729f8beaba8317272bdab34749f934055707b25cfd69c98a9fdcfbc59ae
+SHA512 (zstd-1.3.4.tar.gz) =
d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554
diff --git a/zstd.spec b/zstd.spec
index 10e6589..c4479fb 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -12,8 +12,8 @@
%endif
Name: zstd
-Version: 1.3.3
-Release: 3%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
Summary: Zstd compression library
License: BSD and GPLv2
@@ -114,6 +114,9 @@ install -D -m644 programs/%{name}.1
%{buildroot}%{_mandir}/man1/p%{name}.1
%ldconfig_scriptlets -n lib%{name}
%changelog
+* Wed Mar 28 2018 Pádraig Brady <P(a)draigBrady.com> - 1.3.4-1
+- Latest upstream
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.3-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 2b6f4ac052093192469555e46d940ba47bf621c5
Author: Pádraig Brady <P(a)draigBrady.com>
Date: Wed Mar 14 12:07:00 2018 -0700
reset licence back to GPLv2
diff --git a/zstd.spec b/zstd.spec
index 5615c37..10e6589 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -16,7 +16,7 @@ Version: 1.3.3
Release: 3%{?dist}
Summary: Zstd compression library
-License: BSD and GPLv2+
+License: BSD and GPLv2
URL:
https://github.com/facebook/zstd
Source0:
https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{ve...
commit f08fa73214f4367be9909373963e41834d4215b1
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 11 10:48:25 2018 +0100
package all license files
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index 726b842..5615c37 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -97,11 +97,11 @@ install -D -m644 programs/%{name}.1
%{buildroot}%{_mandir}/man1/p%{name}.1
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/un%{name}.1*
%{_mandir}/man1/%{name}cat.1*
-%license LICENSE
+%license COPYING LICENSE
%files -n lib%{name}
%{_libdir}/libzstd.so.*
-%license LICENSE
+%license COPYING LICENSE
%files -n lib%{name}-devel
%{_includedir}/zbuff.h
commit 48c8969670e11e2b1a4bb9a3a783e63f7bc23854
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 11 10:48:06 2018 +0100
license is GPLv2+, not GPLv2
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index a8da99c..726b842 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -16,7 +16,7 @@ Version: 1.3.3
Release: 3%{?dist}
Summary: Zstd compression library
-License: BSD and GPLv2
+License: BSD and GPLv2+
URL:
https://github.com/facebook/zstd
Source0:
https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{name}-%{ve...
commit 5637076541a7c975111230680398339a217a5188
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 11 10:46:24 2018 +0100
don't hardcode /usr/bin path
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index fc1ec11..a8da99c 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -75,13 +75,13 @@ make -C contrib/pzstd test
%install
%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
# Remove undocumented wrappers of minimal use
-rm %{buildroot}/%{_bindir}/%{name}less
-rm %{buildroot}/%{_bindir}/%{name}grep
+rm %{buildroot}%{_bindir}/%{name}less
+rm %{buildroot}%{_bindir}/%{name}grep
# Don't install the static lib
-rm %{buildroot}/%{_libdir}/libzstd.a
+rm %{buildroot}%{_libdir}/libzstd.a
%if %{with pzstd}
-install -D -m755 contrib/pzstd/pzstd %{buildroot}/usr/bin/pzstd
-install -D -m644 programs/%{name}.1 %{buildroot}/%{_mandir}/man1/p%{name}.1
+install -D -m755 contrib/pzstd/pzstd %{buildroot}%{_bindir}/pzstd
+install -D -m644 programs/%{name}.1 %{buildroot}%{_mandir}/man1/p%{name}.1
%endif
%files
commit 9f8104bc8a73a2ecbb8c486ba1c2b05e560a3d04
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 11 10:45:46 2018 +0100
simplify pzstd build handling
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index 214d637..fc1ec11 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,9 +1,13 @@
+%if 0%{?rhel} && 0%{?rhel} <= 6
# gcc-4.4 is currently too old to compile pzstd
-%if 0%{?fedora} || 0%{?rhel} > 6
+%bcond_with pzstd
+%else
+%ifarch %{ix86} x86_64
+%bcond_without pzstd
+%else
# aarch64 and armv7hl at least currently segfault
# in ThreadPool test for the pzstd util
-%ifarch %{ix86} x86_64
-%global with_pzstd 1
+%bcond_with pzstd
%endif
%endif
@@ -19,7 +23,7 @@ Source0:
https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{n
Patch1: pzstd.1.patch
BuildRequires: gcc gtest-devel
-%if 0%{?with_pzstd}
+%if %{with pzstd}
BuildRequires: gcc-c++
%endif
@@ -44,7 +48,7 @@ Header files for Zstd library.
%prep
%setup -q
find -name .gitignore -delete
-%if 0%{?with_pzstd}
+%if %{with pzstd}
%patch1 -p1
%endif
@@ -54,7 +58,7 @@ export LDFLAGS="$RPM_LD_FLAGS"
for dir in lib programs; do
%make_build -C "$dir"
done
-%if 0%{?with_pzstd}
+%if %{with pzstd}
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
%make_build -C contrib/pzstd
%endif
@@ -63,7 +67,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
export CFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS"
make -C tests test-zstd
-%if 0%{?with_pzstd}
+%if %{with pzstd}
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
make -C contrib/pzstd test
%endif
@@ -75,7 +79,7 @@ rm %{buildroot}/%{_bindir}/%{name}less
rm %{buildroot}/%{_bindir}/%{name}grep
# Don't install the static lib
rm %{buildroot}/%{_libdir}/libzstd.a
-%if 0%{?with_pzstd}
+%if %{with pzstd}
install -D -m755 contrib/pzstd/pzstd %{buildroot}/usr/bin/pzstd
install -D -m644 programs/%{name}.1 %{buildroot}/%{_mandir}/man1/p%{name}.1
%endif
@@ -83,7 +87,7 @@ install -D -m644 programs/%{name}.1
%{buildroot}/%{_mandir}/man1/p%{name}.1
%files
%doc NEWS README.md
%{_bindir}/%{name}
-%if 0%{?with_pzstd}
+%if %{with pzstd}
%{_bindir}/p%{name}
%{_mandir}/man1/p%{name}.1*
%endif
commit d373770caeceae89055cfaf0cba4268bc58c4996
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 11 10:44:15 2018 +0100
simplify build flags handling
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index deab9c7..214d637 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -49,19 +49,23 @@ find -name .gitignore -delete
%endif
%build
-%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS
;}
+export CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_LD_FLAGS"
for dir in lib programs; do
- CFLAGS="%{optflags}" %make_build -C "$dir"
+ %make_build -C "$dir"
done
%if 0%{?with_pzstd}
-CFLAGS="%{optflags}" CXXFLAGS="%{optflags} -std=c++11" %make_build -C
'contrib/pzstd'
+export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
+%make_build -C contrib/pzstd
%endif
%check
-%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS
;}
-CFLAGS="%{optflags}" make -C tests test-zstd
+export CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="$RPM_LD_FLAGS"
+make -C tests test-zstd
%if 0%{?with_pzstd}
-CFLAGS="%{optflags}" CXXFLAGS="%{optflags} -std=c++11" make -C
contrib/pzstd test
+export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
+make -C contrib/pzstd test
%endif
%install
commit c63638a703e83ecd7e6b6d60d2eccfb336396f68
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Sun Feb 11 10:43:56 2018 +0100
add missing BuildRequires: gcc-c++
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index b25cea8..deab9c7 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -19,6 +19,9 @@ Source0:
https://github.com/facebook/zstd/archive/v%{version}.tar.gz#/%{n
Patch1: pzstd.1.patch
BuildRequires: gcc gtest-devel
+%if 0%{?with_pzstd}
+BuildRequires: gcc-c++
+%endif
%description
Zstd, short for Zstandard, is a fast lossless compression algorithm,
commit a85f5cbd7714a84458c3945bb644cb2c39373b35
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 22:32:44 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index d698356..b25cea8 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -9,7 +9,7 @@
Name: zstd
Version: 1.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Zstd compression library
License: BSD and GPLv2
@@ -103,6 +103,9 @@ install -D -m644 programs/%{name}.1
%{buildroot}/%{_mandir}/man1/p%{name}.1
%ldconfig_scriptlets -n lib%{name}
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.3.3-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.3.3-2
- Switch to %%ldconfig_scriptlets
commit 348e7e49c54810718cf7d0c2ab33e04e1ad6b605
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Feb 2 11:17:30 2018 +0100
Switch to %ldconfig_scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/zstd.spec b/zstd.spec
index 97468d2..d698356 100644
--- a/zstd.spec
+++ b/zstd.spec
@@ -9,7 +9,7 @@
Name: zstd
Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Zstd compression library
License: BSD and GPLv2
@@ -100,10 +100,12 @@ install -D -m644 programs/%{name}.1
%{buildroot}/%{_mandir}/man1/p%{name}.1
%{_libdir}/pkgconfig/libzstd.pc
%{_libdir}/libzstd.so
-%post -n lib%{name} -p /sbin/ldconfig
-%postun -n lib%{name} -p /sbin/ldconfig
+%ldconfig_scriptlets -n lib%{name}
%changelog
+* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 1.3.3-2
+- Switch to %%ldconfig_scriptlets
+
* Thu Dec 21 2017 Pádraig Brady <P(a)draigBrady.com> - 1.3.3-1
- Latest upstream