LZMA-SDK.spec

@@ -1,13 +1,11 @@
 
 Name:           LZMA-SDK
-Version:        23.01
+Version:        22.00
-Release:        2
+Release:        1
 Summary:        SDK for lzma compression
 License:        Public Domain
 URL:            http://sourceforge.net/projects/sevenzip/
-Source0:        https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/lzma2301.7z
+Source0:        https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/lzma2200.7z
-Patch0:         remove-Werror.patch
-
 BuildRequires:  gcc-c++ p7zip
 %description
 The LZMA SDK provides the documentation, samples, header files, libraries, and
@@ -32,8 +30,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Development headers for %{name}.
  
 %prep
-%setup -q -c -n lzma2301
+%setup -q -c -n lzma2200
-%patch -P0 -p1
 %define debug_package %{nil} 
 
 for f in .c .cpp .cs .dsp .dsw .h .java .txt makefile; do
@@ -75,37 +72,21 @@ 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}/LZMA-SDK
+install -m 0755 CPP/7zip/Bundles/LzmaCon/_o/lzma %{buildroot}%{_bindir}
-mkdir -p %{buildroot}/%{_includedir}/lzma/
+mkdir -p %{buildroot}/%{_includedir}/lzma2200/
-find -iname '*.h' | xargs -I {} install -m 0755 -D {} %{buildroot}/%{_includedir}/lzma/{}
+find -iname '*.h' | xargs -I {} install -m 0755 -D {} %{buildroot}/%{_includedir}/lzma2200/{}
 
 %files
 %{_bindir}/*
  
 %files devel
-%{_includedir}/lzma/
+%{_includedir}/lzma2200/
 
 %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

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

remove-Werror.patch

@@ -1,35 +0,0 @@
-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 \