From d18cb76b8d7fd4bdae98296cce79b767f8c00ebd Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Fri, 28 Dec 2018 19:20:23 +0300 Subject: [PATCH] xz -2 is the most optimal to recompress tarballs into .src.rpm --- ...se-multithreaded-XZ-by-default-for-both-binary-and-.patch | 5 +++-- rpm.spec | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rpm-5.4.10-Use-multithreaded-XZ-by-default-for-both-binary-and-.patch b/rpm-5.4.10-Use-multithreaded-XZ-by-default-for-both-binary-and-.patch index e1b9f09..6b19697 100644 --- a/rpm-5.4.10-Use-multithreaded-XZ-by-default-for-both-binary-and-.patch +++ b/rpm-5.4.10-Use-multithreaded-XZ-by-default-for-both-binary-and-.patch @@ -16,7 +16,7 @@ diff --git a/macros/mandriva.in b/macros/mandriva.in index 3f742ad..958a869 100644 --- a/macros/mandriva.in +++ b/macros/mandriva.in -@@ -127,8 +127,12 @@ +@@ -127,8 +127,13 @@ # TODO: fix check script and implement support for using #%_multiarch_required_terminate_build 1 @@ -27,7 +27,8 @@ index 3f742ad..958a869 100644 +# w6 is xz level 6 (default), T - threads +# note: w6T0.xzdio will result into 1 thread, w6T.xzdio will result into multiple threads! +%_binary_payload w6T.xzdio -+%_source_payload w6T.xzdio ++# xz -2 is the most optimal for .src.rpm where compressed tarballs are recompressed ++%_source_payload w2T.xzdio %_duplicate_files_terminate_build 1 %_unpackaged_subdirs_terminate_build 0 diff --git a/rpm.spec b/rpm.spec index 727c07e..b98ace8 100644 --- a/rpm.spec +++ b/rpm.spec @@ -61,7 +61,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: %{?prereldate:0.%{prereldate}.}83 +Release: %{?prereldate:0.%{prereldate}.}84 License: LGPLv2.1+ Group: System/Configuration/Packaging Url: http://rpm5.org/