diff --git a/.abf.yml b/.abf.yml index 1dfd4e8..73cdea4 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "xz-5.0.4.tar.xz": 2b57b7825ec62dc4cb3540bd11390c183238688c + xz-5.0.5.tar.xz: 56f1d78117f0c32bbb1cfd40117aa7f55bee8765 diff --git a/xz.spec b/xz.spec index 4949d60..e104202 100644 --- a/xz.spec +++ b/xz.spec @@ -1,22 +1,21 @@ -%define major 5 -%define lname lzma +%define major 5 +%define lname lzma %define libname %mklibname %{lname} %{major} -%define libdev %mklibname -d %{lname} +%define devname %mklibname -d %{lname} -%bcond_without uclibc -%bcond_without dietlibc +%bcond_with uclibc +%bcond_with dietlibc -Summary: XZ utils -Name: xz -Version: 5.0.4 -Release: 2 -License: Public Domain +Summary: XZ utils +Name: xz +Version: 5.0.5 +Release: 2 +License: Public Domain Group: Archiving/Compression +Url: http://tukaani.org/xz/ Source0: http://tukaani.org/xz/%{name}-%{version}.tar.xz Source1: xzme Patch0: xz-5.0.0-text-tune.patch -%rename lzma -%rename lzma-utils # needed by check suite BuildRequires: diffutils %if %{with uclibc} @@ -25,7 +24,8 @@ BuildRequires: uClibc-devel %if %{with diet} BuildRequires: dietlibc-devel %endif -URL: http://tukaani.org/xz/ +%rename lzma +%rename lzma-utils %description XZ provides very high compression ratio and fast decompression. The @@ -36,19 +36,22 @@ tools. Also provides: - Average compression ratio 30% better than that of gzip and 15% better than that of bzip2. - - Decompression speed is only little slower than that of gzip, being two to five times faster than bzip2. - - In fast mode, compresses faster than bzip2 with a comparable compression ratio. - - Achieving the best compression ratios takes four to even twelve times longer than with bzip2. However. this doesn't affect decompressing speed. - - Very similar command line interface than what gzip and bzip2 have. +%files -f %{name}.lang +%doc README THANKS +%{_bindir}/* +%{_mandir}/man1/* + +#---------------------------------------------------------------------------- + %package -n %{libname} Summary: Libraries for decoding XZ/LZMA compression Group: System/Libraries @@ -56,16 +59,37 @@ Group: System/Libraries %description -n %{libname} Libraries for decoding LZMA compression. -%package -n %{libdev} +%files -n %{libname} +/%{_lib}/liblzma.so.%{major}* + +#---------------------------------------------------------------------------- + +%package -n %{devname} Summary: Devel libraries & headers for liblzma Group: Development/C -Provides: %{lname}-devel = %{version}-%{release} -Provides: lib%{lname}-devel = %{version}-%{release} -Requires: %{libname} = %{version} +Requires: %{libname} = %{EVRD} +Provides: %{lname}-devel = %{EVRD} +Provides: lib%{lname}-devel = %{EVRD} -%description -n %{libdev} +%description -n %{devname} Devel libraries & headers for liblzma. +%files -n %{devname} +%{_includedir}/%{lname}.h +%dir %{_includedir}/%{lname} +%{_includedir}/%{lname}/*.h +%{_libdir}/*.so +%{_libdir}/*.a +%if %{with dietlibc} +%{_prefix}/lib/dietlibc/lib-%{_arch}/liblzma.a +%endif +%if %{with uclibc} +%{uclibc_root}%{_libdir}/liblzma.a +%endif +%{_libdir}/pkgconfig/lib%{lname}.pc + +#---------------------------------------------------------------------------- + %prep %setup -q %patch0 -p1 -b .text~ @@ -133,148 +157,3 @@ install -m755 %{SOURCE1} -D %{buildroot}%{_bindir}/xzme %check make check -C objs -%files -f %{name}.lang -%doc README THANKS -%{_bindir}/* -%{_mandir}/man1/* - -%files -n %{libname} -/%{_lib}/lib*.so.%{major}* - -%files -n %{libdev} -%{_includedir}/%{lname}.h -%dir %{_includedir}/%{lname} -%{_includedir}/%{lname}/*.h -%{_libdir}/*.so -%{_libdir}/*.a -%if %{with dietlibc} -%{_prefix}/lib/dietlibc/lib-%{_arch}/liblzma.a -%endif -%if %{with uclibc} -%{uclibc_root}%{_libdir}/liblzma.a -%endif -%{_libdir}/pkgconfig/lib%{lname}.pc - - -%changelog -* Fri Jun 10 2011 Per Øyvind Karlsen 5.0.3-2 -+ Revision: 684196 -- move shared library to /%%{_lib}/ (thx to Shlomi Fish for reporting) -- don't remove libtool library file - -* Sun May 22 2011 Funda Wang 5.0.3-1 -+ Revision: 676969 -- new version 5.0.3 - - + Per Øyvind Karlsen - - build uClibc & diet versions of liblzma - -* Wed Apr 06 2011 Funda Wang 5.0.2-2 -+ Revision: 651010 -- rebuild for lost packages - -* Wed Apr 06 2011 Per Øyvind Karlsen 5.0.2-1 -+ Revision: 650921 -- add missing mode to open(2) -- strip redundant buildroot cleaning -- fix leak (P1) -- new version - -* Wed Mar 23 2011 Per Øyvind Karlsen 5.0.1-1 -+ Revision: 648164 -- remove unneeded %%defattr & buildroot definition -- use %%rename macro -- drop unneeded zlib-devel buildrequires, document diffutils buildrequires -- new version: 5.0.1 -- update url - -* Wed Dec 15 2010 Per Øyvind Karlsen 5.0.0-2mdv2011.0 -+ Revision: 621846 -- update license -- resurrect --text option patch - -* Wed Nov 17 2010 Olivier Faurax 5.0.0-1mdv2011.0 -+ Revision: 598139 -- Bump version to 5.0.0 - -* Wed Mar 17 2010 Oden Eriksson 4.999.9beta-2mdv2010.1 -+ Revision: 524476 -- rebuilt for 2010.1 - - + Per Øyvind Karlsen - - update summary & description due to lzma -> xz name change - -* Thu Sep 03 2009 Per Øyvind Karlsen 4.999.9beta-1mdv2010.0 -+ Revision: 428978 -- update to 4.999.9beta - -* Mon Mar 09 2009 Per Øyvind Karlsen 4.999.8beta-0.2mdv2009.1 -+ Revision: 353301 -- add back recompression tool (xzme, renamed from lzme, now using xz format, fixes #48231) - -* Sun Jan 25 2009 Per Øyvind Karlsen 4.999.8beta-0.1mdv2009.1 -+ Revision: 333378 -- update to latest code from git (contains some fixes required by pyliblzma 0.5.0) - -* Thu Jan 08 2009 Funda Wang 4.999.7-0.beta.2mdv2009.1 -+ Revision: 327157 -- rebuild - -* Mon Jan 05 2009 Per Øyvind Karlsen 4.999.7-0.beta.1mdv2009.1 -+ Revision: 325129 -- update to 4.999.7beta - -* Tue Dec 30 2008 Per Øyvind Karlsen 4.999.6-0.alpha.6mdv2009.1 -+ Revision: 321391 -- add lzme util from older lzma package (should become xzme eventually..) - -* Mon Dec 29 2008 Per Øyvind Karlsen 4.999.6-0.alpha.5mdv2009.1 -+ Revision: 321121 -- rename to 'xz' -- add text tune patch (P1) which provides same --text option as we introduced for - old tool.. -- update source, new tool and format has now been renamed to 'xz' -- rename - -* Mon Dec 22 2008 Oden Eriksson 4.999.6-0.alpha.4mdv2009.1 -+ Revision: 317511 -- fix major, he he he, funny! - -* Sun Dec 21 2008 Oden Eriksson 4.999.6-0.alpha.3mdv2009.1 -+ Revision: 317047 -- rebuild - -* Sun Oct 19 2008 Per Øyvind Karlsen 4.999.6-0.alpha.2mdv2009.1 -+ Revision: 295258 -- d'oh, bump major again due to lzmalib conflicts - -* Fri Oct 17 2008 Per Øyvind Karlsen 4.999.6-0.alpha.1mdv2009.1 -+ Revision: 294620 -- * new release - * ditch lzma-4.999.3alpha-use-lzma_alone-format-by-default.patch, this is now the - default - * bump major (P1) - -* Fri Jul 18 2008 Per Øyvind Karlsen 4.999.3-0.alpha.3mdv2009.0 -+ Revision: 238248 -- new git snapshot -- drop P1 (fixed upstream) -- drop ldconfig scriptlets since package is new and doesn't exist in older releases - - + Pixel - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Mon May 12 2008 Per Øyvind Karlsen 4.999.3-0.alpha.2mdv2009.0 -+ Revision: 206503 -- remove help text about options not available for LZMA_Alone (updates P0) -- handle broken pipe (P1) -- build with -O3 & -funroll-loops - -* Sun May 04 2008 Per Øyvind Karlsen 4.999.3-0.alpha.1mdv2009.0 -+ Revision: 201109 -- provide liblzma-devel -- import lzma-utils - - -* Thu Apr 30 2008 Per Øyvind Karlsen 4.99.3alpha-1 -- initial Mandriva release.