From 86be06a75384f1838fa4b1bba856577ef005ee8a Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sat, 18 Aug 2012 21:58:51 +1100 Subject: [PATCH] LOG Spec cleanup, drop .la files --- lzma.spec | 59 ++++++++----------------------------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/lzma.spec b/lzma.spec index 2eaa349..ff4ed90 100644 --- a/lzma.spec +++ b/lzma.spec @@ -1,25 +1,18 @@ -%define name lzma -%define version 4.43 -%define oldlzmaver 4.32.7 -%define release %mkrel 31 -%define major 0 +%define oldlzmaver 4.32.7 +%define major 0 %define libname %mklibname lzmadec %{major} %define libdev %mklibname -d lzmadec Summary: LZMA utils -Name: %{name} -Version: %{version} -Release: %{release} +Name: lzma +Version: 4.43 +Release: 32 License: GPL Group: Archiving/Compression +URL: http://tukaani.org/lzma/ Source0: http://tukaani.org/lzma/lzma-%{oldlzmaver}.tar.lzma Source1: http://ovh.dl.sourceforge.net/sourceforge/sevenzip/lzma443.tar.bz2 -#Source2: lzme Source3: sqlzma.h -#Patch0: lzma-432-makefile.patch.bz2 -#Patch1: lzma-432-makefile-sdknew.patch.bz2 -#Patch2: lzma-4.43-lzmp.patch - # (blino) modified for 443, from sqlzma1-449.patch: # * adapted to lzma443 dist structure: s,/C/Compress/Lzma/,/C/7zip/Compress/LZMA_C/,; s,/CPP/7zip/Compress/LZMA_Alone/,/C/7zip/Compress/LZMA_Alone/, # * use sqlzma.mk makefiles for 443 (from from sqlzma1-443.patch) @@ -32,19 +25,13 @@ Patch6: lzma-4.43-update-version.patch Patch7: lzma-4.43-fix-fast-compression.patch Patch8: lzma-4.43-add-missing-gethandle.patch Patch9: lzma-4.32.4-text-tune.patch -#Patch10: lzma-4.32.0beta3-fix-stdout.patch -#Patch11: lzma-4.43-fix-liblzmadec-header-includes.patch # 4.32.2 has changes to sdk that we replace with newer, we apply these to the new Patch12: lzma-4.32.2-sdk-changes.patch -#Patch13: lzma-4.32.2-file_modes.patch -#Patch14: lzma-4.32.3-liblzmadec-fix.patch -#Patch15: lzma-4.32.5-fix-deprecated-string-conversion.patch Patch16: lzma-4.32.7-format_not_a_string_literal_and_no_format_arguments.diff # for squashfs-lzma library BuildRequires: zlib-devel -BuildRequires: dos2unix diffutils -URL: http://tukaani.org/lzma/ -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRequires: dos2unix +BuildRequires: diffutils %description LZMA provides very high compression ratio and fast decompression. The @@ -73,7 +60,6 @@ Summary: Libraries for decoding LZMA compression Group: System/Libraries License: LGPL Provides: %{_lib}%{name}%{major} = %{version}-%{release} -Obsoletes: %{_lib}%{name}%{major} <= %{version}-%{release} %description -n %{libname} Libraries for decoding LZMA compression. @@ -83,8 +69,6 @@ Summary: Devel libraries & headers for liblzmadec Group: Development/C License: LGPL Provides: liblzmadec-devel = %{version}-%{release} -Provides: %{_lib}%{name}%{major}-devel = %{version}-%{release} -Obsoletes: %{_lib}%{name}%{major}-devel <= %{version}-%{release} Provides: %{name}-devel = %{version}-%{release} Requires: %{libname} = %{version} @@ -103,9 +87,6 @@ Kernel modules for decoding LZMA compression. %prep %setup -q -n %{name}-%{oldlzmaver} -a1 -#%patch0 -p1 -b .427 -#%patch1 -p1 -b .427_sdk -#%patch2 -p1 %patch3 -p1 -b .sqlzma cp %{SOURCE3} . dos2unix *.txt @@ -125,12 +106,7 @@ find src/sdk -name makefile|xargs rm -f %patch7 -p0 -b .fast %patch8 -p0 -b .gethandle %patch9 -p1 -b .text -#%patch10 -p1 -b .stdout -#%patch11 -p1 -b .lzmadec_systypes %patch12 -p1 -b .4.32.2 -#%patch13 -p1 -b .file_modes -#%patch14 -p1 -b .liblzmadec_fix -#%%patch15 -p0 -b .fix_string_conversion %patch16 -p1 -b .format_not_a_string_literal_and_no_format_arguments pushd C/7zip/Compress/LZMA_C @@ -159,12 +135,7 @@ CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -O3" \ %install rm -rf %{buildroot} %makeinstall_std -#install -m755 %{SOURCE2} -D %{buildroot}%{_bindir}/lzme -rm -f %{buildroot}%{_libdir}/*.la - -#symlink to provide backward compatibility for stuff still using old 'lzmash' script -#ln -s lzma %{buildroot}%{_bindir}/lzmash install C/7zip/Compress/LZMA_*/*.a %{buildroot}%{_libdir} mkdir -p %{buildroot}/usr/src/%{name}-%{version}-%{release}/ @@ -175,16 +146,6 @@ rm -rf %{buildroot}{%{_bindir},%{_mandir}} %check make check -%clean -rm -rf %{buildroot} - -%if %mdkversion < 200900 -%post -n %{libname} -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %{libname} -p /sbin/ldconfig -%endif - %post -n dkms-%{name} set -x /usr/sbin/dkms --rpm_safe_upgrade add -m %{name} -v %{version}-%{release} @@ -198,19 +159,15 @@ set -x : %files -n %{libname} -%defattr(-,root,root) %{_libdir}/lib*.so.* %files -n %{libdev} -%defattr(644,root,root,755) %doc *.txt -%defattr(-,root,root) %{_includedir}/*.h %{_libdir}/*.so %{_libdir}/*.a %files -n dkms-%{name} -%defattr(-,root,root) /usr/src/%{name}-%{version}-%{release}