diff --git a/baselibs.conf b/baselibs.conf index a9234b9..a3d5930 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libclzma-suse0 +libclzma-suse1 diff --git a/lzma-sdk-shlib.patch b/lzma-sdk-shlib.patch index 9a4a199..74d077b 100644 --- a/lzma-sdk-shlib.patch +++ b/lzma-sdk-shlib.patch @@ -21,9 +21,9 @@ Index: 1/Makefile.am +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/Sha256Opt.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 ++#lzma.dll = C/Alloc.c C/CpuArch.c C/LzFind.c C/LzFindMt.c C/LzFindOpt.c C/LzmaDec.c C/LzmaEnc.c C/LzmaLib.c C/Threads.c ++libclzma_la_SOURCES = C/7zAlloc.c C/7zArcIn.c C/7zBuf.c C/7zBuf2.c C/7zCrc.c C/7zCrcOpt.c C/7zDec.c C/7zFile.c C/7zStream.c C/Aes.c C/AesOpt.c C/Alloc.c C/Bcj2.c C/Bcj2Enc.c C/Bra.c C/Bra86.c C/BraIA64.c C/CpuArch.c C/Delta.c C/DllSecur.c C/LzFind.c C/LzFindMt.c C/LzFindOpt.c C/Lzma2Dec.c C/Lzma2DecMt.c C/Lzma2Enc.c C/Lzma86Dec.c C/Lzma86Enc.c C/LzmaDec.c C/LzmaEnc.c C/LzmaLib.c C/MtCoder.c C/MtDec.c C/Ppmd7.c C/Ppmd7Dec.c C/Ppmd7Enc.c C/Sha256.c C/Sha256Opt.c C/Sort.c C/SwapBytes.c C/Threads.c C/Xz.c C/XzCrc64.c C/XzCrc64Opt.c C/XzDec.c C/XzEnc.c C/XzIn.c ++libclzma_la_LDFLAGS = -release suse -version-info 1: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 diff --git a/lzma-sdk.spec b/lzma-sdk.spec index 9899df1..8ef2224 100644 --- a/lzma-sdk.spec +++ b/lzma-sdk.spec @@ -27,7 +27,7 @@ Summary: An implementation of LZMA compression License: LGPL-2.1-only Group: Productivity/Archiving/Compression URL: https://www.7-zip.org/sdk.html -Source0: https://www.7-zip.org/a/lzma%{_sver}.7z +Source0: https://www.7-zip.org/a/lzma%_sver.7z Source1: lzma-sdk-LICENSE.fedora Source2: baselibs.conf Patch1: lzma-sdk-shlib.patch @@ -52,50 +52,48 @@ LZMA yields around 20%% better compression when operating at approximately zlib's speed, and around 40%% when trading more time. %package devel -Summary: Development libraries and headers for %{name} +Summary: Development libraries and headers for %name Group: Development/Languages/C and C++ -Requires: libclzma-suse0 = %{version} +Requires: libclzma-suse1 = %version %description devel -This package contains development libraries and headers for %{name}. +This package contains development libraries and headers for %name. -%package -n libclzma-suse0 +%package -n libclzma-suse1 Summary: LZMA stream encoding/decoding library from 7-Zip Group: System/Libraries -%description -n libclzma-suse0 +%description -n libclzma-suse1 Library for encoding/decoding LZMA streams, using the 7-Zip library implementation. %prep -%setup -q -c -n lzma%{_sver} -%patch -P 1 -p1 +%autosetup -c -n lzma%_sver perl -i -pe 's{AC_INIT.*}{AC_INIT([lzma-sdk], [%version])}' configure.ac dos2unix DOC/*.txt -install -p -m 0644 %{SOURCE1} . +install -p -m 0644 %SOURCE1 . %build autoreconf -fi %configure -make %{?_smp_mflags} +%make_build %install %make_install rm -f "%buildroot/%_libdir"/*.la -%post -n libclzma-suse0 -p /sbin/ldconfig -%postun -n libclzma-suse0 -p /sbin/ldconfig +%ldconfig_scriptlets -n libclzma-suse1 -%files -n libclzma-suse0 +%files -n libclzma-suse1 %license lzma-sdk-LICENSE.fedora %doc DOC/lzma.txt DOC/lzma-history.txt -%{_libdir}/libclzma-suse.so.0* +%_libdir/libclzma-suse.so.* %files devel %license lzma-sdk-LICENSE.fedora %doc DOC/7z*.txt DOC/Methods.txt -%{_includedir}/clzma/ -%{_libdir}/libclzma.so -%{_libdir}/pkgconfig/clzma.pc +%_includedir/clzma/ +%_libdir/libclzma.so +%_libdir/pkgconfig/clzma.pc %changelog