Hello community, here is the log from the commit of package lzma-sdk for openSUSE:Factory checked in at 2018-01-10 23:35:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lzma-sdk (Old) and /work/SRC/openSUSE:Factory/.lzma-sdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lzma-sdk" Wed Jan 10 23:35:07 2018 rev:2 rq:562860 version:17.01 Changes: -------- --- /work/SRC/openSUSE:Factory/lzma-sdk/lzma-sdk.changes 2017-06-20 09:38:54.588635063 +0200 +++ /work/SRC/openSUSE:Factory/.lzma-sdk.new/lzma-sdk.changes 2018-01-10 23:35:09.960029027 +0100 @@ -1,0 +2,7 @@ +Mon Jan 8 08:02:11 UTC 2018 - [email protected] + +- Update to new upstream release 17.01 + * Some bugs were fixed. +- Replace lzma-sdk-16.04-sharedlib.patch with lzma-sdk-shlib.patch. + +------------------------------------------------------------------- Old: ---- lzma-sdk-16.04-sharedlib.patch lzma1604.7z New: ---- lzma-sdk-shlib.patch lzma1701.7z ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lzma-sdk.spec ++++++ --- /var/tmp/diff_new_pack.JbgVhS/_old 2018-01-10 23:35:11.963935001 +0100 +++ /var/tmp/diff_new_pack.JbgVhS/_new 2018-01-10 23:35:11.967934813 +0100 @@ -1,7 +1,7 @@ # # spec file for package lzma-sdk # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define _sver 1604 -%define _maver 16 -%define _miver 04 + +%define _sver 1701 +%define _maver 17 +%define _miver 01 Name: lzma-sdk -Version: 16.04 +Version: 17.01 Release: 0 Summary: An implementation of LZMA compression # Actually the site says "Public Domain". See license file. @@ -28,10 +29,12 @@ Url: http://www.7-zip.org/sdk.html Source0: http://www.7-zip.org/a/lzma%{_sver}.7z Source1: lzma-sdk-LICENSE.fedora -Patch0: lzma-sdk-16.04-sharedlib.patch +Patch1: lzma-sdk-shlib.patch +BuildRequires: automake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: p7zip BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,72 +53,48 @@ %package devel Summary: Development libraries and headers for %{name} Group: Development/Languages/C and C++ -Requires: liblzmasdk%{_maver} = %{version} +Requires: libclzma-suse0 = %{version} %description devel This package contains development libraries and headers for %{name}. -%package -n liblzmasdk%{_maver} -Summary: 7-Zip LZMA library -Group: Productivity/Archiving/Compression - -%description -n liblzmasdk%{_maver} -Library for encoding/decoding LZMA files from the 7-Zip project. +%package -n libclzma-suse0 +Summary: LZMA stream encoding/decoding library from 7-Zip +Group: System/Libraries + +%description -n libclzma-suse0 +Library for encoding/decoding LZMA streams, using the 7-Zip library +implementation. %prep %setup -q -c -n lzma%{_sver} -%patch0 -p1 -sed -e 's/__LIBMAJ__/%{_maver}/' \ - -e 's/__LIBMIN__/%{_miver}/' \ - -i CPP/7zip/Bundles/LzmaCon/makefile.gcc +%patch -P 1 -p1 +perl -i -pe 's{AC_INIT.*}{AC_INIT([lzma-sdk], [%version])}' configure.ac dos2unix DOC/*.txt install -p -m 0644 %{SOURCE1} . %build -cd CPP/7zip/Bundles/LzmaCon -make %{?_smp_mflags} -f makefile.gcc clean all +autoreconf -fi +%configure +make %{?_smp_mflags} %install -mkdir -p %{buildroot}%{_libdir} -install -m0755 CPP/7zip/Bundles/LzmaCon/liblzmasdk.so.%{_maver}.%{_miver} %{buildroot}%{_libdir} -pushd %{buildroot}%{_libdir} -ln -s liblzmasdk.so.%{version} liblzmasdk.so.%{_maver} -ln -s liblzmasdk.so.%{version} liblzmasdk.so -popd -mkdir -p %{buildroot}/%{_includedir}/lzma%{_sver}/ -find . -iname '*.h' | xargs -I {} install -m0644 -D {} %{buildroot}/%{_includedir}/lzma-sdk/{} - -# creates support file for pkg-config -mkdir %{buildroot}/%{_libdir}/pkgconfig -tee %{buildroot}/%{_libdir}/pkgconfig/lzma-sdk.pc <<"EOF" -prefix=%{_prefix} -exec_prefix=%{_prefix} -libdir=%{_libdir} -includedir=%{_includedir} - -Name: lzma-sdk -Description: 7-Zip implementation of LZMA compression -Version: %{version} -Libs: -L${libdir} -llzmasdk -Cflags: -I${includedir}/lzma-sdk -EOF - -%fdupes -s %{buildroot}/%{_includedir}/lzma-sdk +%make_install +rm -f "%buildroot/%_libdir"/*.la -%post -n liblzmasdk%{_maver} -p /sbin/ldconfig -%postun -n liblzmasdk%{_maver} -p /sbin/ldconfig +%post -n libclzma-suse0 -p /sbin/ldconfig +%postun -n libclzma-suse0 -p /sbin/ldconfig -%files -n liblzmasdk%{_maver} +%files -n libclzma-suse0 %defattr(-,root,root) %doc DOC/lzma.txt DOC/lzma-history.txt lzma-sdk-LICENSE.fedora -%{_libdir}/liblzmasdk.so.%{_maver}.%{_miver} -%{_libdir}/liblzmasdk.so.%{_maver} +%{_libdir}/libclzma-suse.so.0* %files devel %defattr(-,root,root) %doc DOC/7z*.txt DOC/Methods.txt lzma-sdk-LICENSE.fedora -%{_includedir}/lzma-sdk/ -%{_libdir}/liblzmasdk.so -%{_libdir}/pkgconfig/lzma-sdk.pc +%{_includedir}/clzma/ +%{_libdir}/libclzma.so +%{_libdir}/pkgconfig/clzma.pc %changelog ++++++ lzma-sdk-shlib.patch ++++++ From: Jan Engelhardt <[email protected]> Date: 2018-01-08 14:43:34.344321909 +0100 This exports most of LzmaLib (minus code that does not compile because it requires too much Windows or Windows-like APIs) as a library for use by other packages. --- C/Bcj2Enc.c | 2 ++ C/Lzma2Enc.c | 4 ++-- Makefile.am | 11 +++++++++++ clzma.pc.in | 10 ++++++++++ configure.ac | 6 ++++++ 5 files changed, 31 insertions(+), 2 deletions(-) Index: 1/C/Bcj2Enc.c =================================================================== --- 1.orig/C/Bcj2Enc.c +++ 1/C/Bcj2Enc.c @@ -12,7 +12,9 @@ #define PRF(x) #endif +#ifdef _WIN32 #include <windows.h> +#endif #include <string.h> #include "Bcj2.h" Index: 1/C/Lzma2Enc.c =================================================================== --- 1.orig/C/Lzma2Enc.c +++ 1/C/Lzma2Enc.c @@ -720,10 +720,10 @@ SRes Lzma2Enc_Encode2(CLzma2EncHandle pp CLzma2Enc *p = (CLzma2Enc *)pp; if (inStream && inData) - return E_INVALIDARG; + return SZ_ERROR_PARAM; if (outStream && outBuf) - return E_INVALIDARG; + return SZ_ERROR_PARAM; { unsigned i; Index: 1/Makefile.am =================================================================== --- /dev/null +++ 1/Makefile.am @@ -0,0 +1,11 @@ +AM_CPPFLAGS = -D_7ZIP_ST -D_7ZIP_PPMD_SUPPPORT +lib_LTLIBRARIES = libclzma.la +pkgconfigdir = ${libdir}/pkgconfig +pkgconfig_DATA = clzma.pc +# source list: C/Util/LzmaLib/makefile +libclzma_la_SOURCES = C/7zAlloc.c C/7zArcIn.c C/7zBuf2.c C/7zBuf.c C/7zCrc.c C/7zCrcOpt.c C/7zDec.c C/7zFile.c C/7zStream.c C/7zVersion.rc C/Aes.c C/AesOpt.c C/Alloc.c C/Bcj2.c C/Bra86.c C/Bra.c C/BraIA64.c C/CpuArch.c C/Delta.c C/DllSecur.c C/LzFind.c C/Lzma2Dec.c C/Lzma2Enc.c C/Lzma86Dec.c C/Lzma86Enc.c C/LzmaDec.c C/LzmaEnc.c C/LzmaLib.c C/Ppmd7.c C/Ppmd7Dec.c C/Ppmd7Enc.c C/Sha256.c C/Sort.c C/Xz.c C/XzCrc64.c C/XzCrc64Opt.c C/XzDec.c C/XzEnc.c C/XzIn.c +#ifWIN32#SOURCES += C/Bcj2Enc.c C/LzFindMt.c C/MtCoder.c C/Threads.c +libclzma_la_LDFLAGS = -release suse -version-info 0:0:0 +clzmadir = ${includedir}/clzma +clzma_HEADERS = C/7zAlloc.h C/7zBuf.h C/7zCrc.h C/7zFile.h C/7z.h C/7zTypes.h C/7zVersion.h C/Aes.h C/Alloc.h C/Bcj2.h C/Bra.h C/Compiler.h C/CpuArch.h C/Delta.h C/DllSecur.h C/LzFind.h C/LzFindMt.h C/LzHash.h C/Lzma2Dec.h C/Lzma2Enc.h C/Lzma86.h C/LzmaDec.h C/LzmaEnc.h C/LzmaLib.h C/MtCoder.h C/Ppmd7.h C/Ppmd.h C/Precomp.h C/RotateDefs.h C/Sha256.h C/Sort.h C/Threads.h C/XzCrc64.h C/XzEnc.h C/Xz.h +clzma.pc: ${top_builddir}/config.status Index: 1/clzma.pc.in =================================================================== --- /dev/null +++ 1/clzma.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: clzma +Description: 7-Zip implementation of LZMA compression +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lclzma +Cflags: -I${includedir}/clzma Index: 1/configure.ac =================================================================== --- /dev/null +++ 1/configure.ac @@ -0,0 +1,6 @@ +AC_INIT([lzma-sdk], [0]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) +AC_PROG_CC +LT_INIT([disable-static]) +AC_CONFIG_FILES([Makefile clzma.pc]) +AC_OUTPUT
