!21 [sync] PR-19: reslove the conflict between xz-lzma-compat and LZMA-SDK

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

LZMA-SDK.spec

@@ -1,11 +1,13 @@
 
 Name:           LZMA-SDK
-Version:        22.00
+Version:        23.01
-Release:        1
+Release:        2
 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
+Source0:        https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/lzma2301.7z
+Patch0:         remove-Werror.patch
+
 BuildRequires:  gcc-c++ p7zip
 %description
 The LZMA SDK provides the documentation, samples, header files, libraries, and
@@ -30,7 +32,8 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Development headers for %{name}.
  
 %prep
-%setup -q -c -n lzma2200
+%setup -q -c -n lzma2301
+%patch -P0 -p1
 %define debug_package %{nil} 
 
 for f in .c .cpp .cs .dsp .dsw .h .java .txt makefile; do
@@ -72,21 +75,37 @@ 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}/lzma2200/
+mkdir -p %{buildroot}/%{_includedir}/lzma/
-find -iname '*.h' | xargs -I {} install -m 0755 -D {} %{buildroot}/%{_includedir}/lzma2200/{}
+find -iname '*.h' | xargs -I {} install -m 0755 -D {} %{buildroot}/%{_includedir}/lzma/{}
 
 %files
 %{_bindir}/*
  
 %files devel
-%{_includedir}/lzma2200/
+%{_includedir}/lzma/
 
 %files doc
 %doc DOC/7z*.txt DOC/Methods.txt DOC/lzma.txt DOC/lzma-history.txt
 
 %changelog
+* Wed Sep 13 2023 peijiankang <peijiankang@kylinos.cn> - 23.01-2
+- reslove the conflict between xz-lzma-compat and LZMA-SDK
+
+* Fri Sep  1 2023 dillon chen <dillon.chen@gmail.com> - 23.01-1
+- upgrade to 23.01
+
+* Mon Aug 28 2023 dillon chen <dillon.chen@gmail.com> - 22.00-3
+- remove -Werror under gcc 12.3.1 compiler
+
+* Wed Aug 03 2022 tanjinghui1 <tanjinghui1@huawei.com> - 22.00-2
+- change header file path lzma2200 to lzma
+
 * Thu Jul 14 2022 tanjinghui1 <tanjinghui1@huawei.com> - 22.00-1
+- upgrade to 22.00
+
 * Fri May 27 2022 tanjinghui1 <tanjinghui1@h-partners.com> - 21.07-1
+- upgrade to 21.07
+
 * Fri Dec 4 2020 tangmeng5 <tangmeng5@huawei.com> - 19.00-1
 - package init

LZMA-SDK.yaml

@@ -0,0 +1,5 @@
+version_control: sourceforge.net
+src_repo: https://sourceforge.net/projects/sevenzip/files/7-Zip/
+tag_prefix: "^v"
+separator: "."
+

remove-Werror.patch

@@ -0,0 +1,35 @@
+diff -urN lzma2301/C/7zip_gcc_c.mak lzma2301.new/C/7zip_gcc_c.mak
+--- lzma2301/C/7zip_gcc_c.mak	2023-05-03 21:00:00.000000000 +0800
++++ lzma2301.new/C/7zip_gcc_c.mak	2023-09-01 12:09:49.814715435 +0800
+@@ -14,7 +14,7 @@
+ PROGPATH_STATIC = $(O)/$(PROG)s
+ 
+ ifneq ($(CC), xlc)
+-CFLAGS_WARN_WALL = -Wall -Werror -Wextra
++CFLAGS_WARN_WALL = -Wall -Wextra
+ endif
+ 
+ # for object file
+diff -urN lzma2301/CPP/7zip/7zip_gcc.mak lzma2301.new/CPP/7zip/7zip_gcc.mak
+--- lzma2301/CPP/7zip/7zip_gcc.mak	2023-05-03 21:00:00.000000000 +0800
++++ lzma2301.new/CPP/7zip/7zip_gcc.mak	2023-09-01 12:10:26.934926776 +0800
+@@ -24,7 +24,7 @@
+ 
+ 
+ ifneq ($(CC), xlc)
+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra
++CFLAGS_WARN_WALL = -Wall -Wextra
+ endif
+ 
+ # for object file
+diff -urN lzma2301/CPP/Build.mak lzma2301.new/CPP/Build.mak
+--- lzma2301/CPP/Build.mak	2023-05-01 18:00:00.000000000 +0800
++++ lzma2301.new/CPP/Build.mak	2023-09-01 12:10:07.110813908 +0800
+@@ -67,7 +67,6 @@
+ !IF "$(CC)" == "clang-cl"
+ 
+ CFLAGS = $(CFLAGS) \
+-  -Werror \
+   -Wall \
+   -Wextra \
+   -Weverything \