From a2e894b86982833d0d4f25fb373c8daf0943d56a Mon Sep 17 00:00:00 2001 From: peijiankang Date: Mon, 6 Mar 2023 17:57:48 +0800 Subject: [PATCH] reslove the conflict between xz-lzma-compat and LZMA-SDK (cherry picked from commit 68a9b047e0b0cb55d64d4f3b5983e082f64e8baa) --- LZMA-SDK.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/LZMA-SDK.spec b/LZMA-SDK.spec index 1cae3f1..a74ec45 100644 --- a/LZMA-SDK.spec +++ b/LZMA-SDK.spec @@ -1,12 +1,13 @@ Name: LZMA-SDK Version: 22.00 -Release: 2 +Release: 3 Summary: SDK for lzma compression License: Public Domain URL: http://sourceforge.net/projects/sevenzip/ Source0: https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/lzma2200.7z BuildRequires: gcc-c++ p7zip + %description The LZMA SDK provides the documentation, samples, header files, libraries, and tools you need to develop applications that use LZMA compression. @@ -72,7 +73,7 @@ make -f makefile.gcc clean all CXX="g++ %{optflags} -fPIC" CXX_C="gcc %{optflags %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} -install -m 0755 CPP/7zip/Bundles/LzmaCon/_o/lzma %{buildroot}%{_bindir} +install -m 0755 CPP/7zip/Bundles/LzmaCon/_o/lzma %{buildroot}%{_bindir}/LZMA-SDK mkdir -p %{buildroot}/%{_includedir}/lzma/ find -iname '*.h' | xargs -I {} install -m 0755 -D {} %{buildroot}/%{_includedir}/lzma/{} @@ -86,6 +87,9 @@ find -iname '*.h' | xargs -I {} install -m 0755 -D {} %{buildroot}/%{_includedir %doc DOC/7z*.txt DOC/Methods.txt DOC/lzma.txt DOC/lzma-history.txt %changelog +* Mon Mar 06 2023 peijiankang - 22.00-3 +- reslove the conflict between xz-lzma-compat and LZMA-SDK + * Wed Aug 03 2022 tanjinghui1 - 22.00-2 - change header file path lzma2200 to lzma -- Gitee