import

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  "xz-5.0.3.tar.xz": 2be9c77ef4a44c9f8eb296cff2ff687e6444a299
+  "xz-5.1.1alpha.tar.xz": 38c87c99817aa496381b828536b1ef8bf7be1ebe

xz-5.1.1alpha-text-tune.patch

@@ -1,5 +1,5 @@
---- xz-5.0.0/src/liblzma/api/lzma/container.h.text~	2010-10-23 16:47:33.000000000 +0200
+--- xz-5.1.1alpha/src/liblzma/api/lzma/container.h.text~	2011-08-18 18:24:40.000000000 +0200
-+++ xz-5.0.0/src/liblzma/api/lzma/container.h	2010-12-14 23:57:08.628431579 +0100
++++ xz-5.1.1alpha/src/liblzma/api/lzma/container.h	2011-08-18 19:10:12.065402208 +0200
 @@ -43,7 +43,7 @@
  /*
   * Preset flags
@@ -9,7 +9,7 @@
   */
  
  /**
-@@ -59,6 +59,13 @@
+@@ -59,6 +59,12 @@
   */
  #define LZMA_PRESET_EXTREME       (UINT32_C(1) << 31)
  
@@ -19,12 +19,11 @@
 + * TODO
 + */
 +#define LZMA_PRESET_TEXT          (UINT32_C(1) << 18)
-+
  
+ #ifdef LZMA_UNSTABLE /* Unstable API that may change. Use only for testing. */
  /**
-  * \brief       Calculate approximate memory usage of easy encoder
+--- xz-5.1.1alpha/src/liblzma/lzma/lzma_encoder_presets.c.text~	2011-08-18 18:24:40.000000000 +0200
---- xz-5.0.0/src/liblzma/lzma/lzma_encoder_presets.c.text~	2010-10-23 16:47:33.000000000 +0200
++++ xz-5.1.1alpha/src/liblzma/lzma/lzma_encoder_presets.c	2011-08-18 19:08:52.453282915 +0200
-+++ xz-5.0.0/src/liblzma/lzma/lzma_encoder_presets.c	2010-12-15 01:01:27.610442970 +0100
 @@ -18,7 +18,7 @@ lzma_lzma_preset(lzma_options_lzma *opti
  {
  	const uint32_t level = preset & LZMA_PRESET_LEVEL_MASK;
@@ -53,9 +52,9 @@
 +
  	return false;
  }
---- xz-5.0.0/src/xz/args.c.text~	2010-10-23 16:47:33.000000000 +0200
+--- xz-5.1.1alpha/src/xz/args.c.text~	2011-08-18 18:24:40.000000000 +0200
-+++ xz-5.0.0/src/xz/args.c	2010-12-14 23:57:08.639432696 +0100
++++ xz-5.1.1alpha/src/xz/args.c	2011-08-18 19:08:52.454282916 +0200
-@@ -76,6 +76,7 @@ parse_real(args_info *args, int argc, ch
+@@ -78,6 +78,7 @@ parse_real(args_info *args, int argc, ch
  		OPT_NO_ADJUST,
  		OPT_INFO_MEMORY,
  		OPT_ROBOT,
@@ -63,7 +62,7 @@
  	};
  
  	static const char short_opts[]
-@@ -113,6 +114,8 @@ parse_real(args_info *args, int argc, ch
+@@ -117,6 +118,8 @@ parse_real(args_info *args, int argc, ch
  		{ "extreme",      no_argument,       NULL,  'e' },
  		{ "fast",         no_argument,       NULL,  '0' },
  		{ "best",         no_argument,       NULL,  '9' },
@@ -72,7 +71,7 @@
  
  		// Filters
  		{ "lzma1",        optional_argument, NULL,  OPT_LZMA1 },
-@@ -401,6 +404,10 @@ parse_real(args_info *args, int argc, ch
+@@ -415,6 +418,10 @@ parse_real(args_info *args, int argc, ch
  			opt_auto_adjust = false;
  			break;
  
@@ -83,9 +82,9 @@
  		default:
  			message_try_help();
  			tuklib_exit(E_ERROR, E_ERROR, false);
---- xz-5.0.0/src/xz/coder.c.text~	2010-10-23 16:47:33.000000000 +0200
+--- xz-5.1.1alpha/src/xz/coder.c.text~	2011-08-18 18:24:40.000000000 +0200
-+++ xz-5.0.0/src/xz/coder.c	2010-12-14 23:57:08.640432976 +0100
++++ xz-5.1.1alpha/src/xz/coder.c	2011-08-18 19:08:52.456282919 +0200
-@@ -47,6 +47,9 @@ static size_t preset_number = 6;
+@@ -49,6 +49,9 @@ static uint32_t preset_number = 6;
  /// compression ratio.
  static bool preset_extreme = false;
  
@@ -95,7 +94,7 @@
  /// Integrity check type
  static lzma_check check;
  
-@@ -89,6 +92,14 @@ coder_set_extreme(void)
+@@ -99,6 +102,14 @@ coder_set_extreme(void)
  
  
  extern void
@@ -110,7 +109,7 @@
  coder_add_filter(lzma_vli id, void *options)
  {
  	if (filters_count == LZMA_FILTERS_MAX)
-@@ -137,6 +148,9 @@ coder_set_compression_settings(void)
+@@ -156,6 +167,9 @@ coder_set_compression_settings(void)
  		if (preset_extreme)
  			preset_number |= LZMA_PRESET_EXTREME;
  
@@ -120,9 +119,9 @@
  		if (lzma_lzma_preset(&opt_lzma, preset_number))
  			message_bug();
  
---- xz-5.0.0/src/xz/coder.h.text~	2010-10-23 16:47:33.000000000 +0200
+--- xz-5.1.1alpha/src/xz/coder.h.text~	2011-08-18 18:24:40.000000000 +0200
-+++ xz-5.0.0/src/xz/coder.h	2010-12-14 23:57:08.649682731 +0100
++++ xz-5.1.1alpha/src/xz/coder.h	2011-08-18 19:08:52.457282921 +0200
-@@ -51,6 +51,9 @@ extern void coder_set_preset(size_t new_
+@@ -57,6 +57,9 @@ extern void coder_set_preset(uint32_t ne
  /// Enable extreme mode
  extern void coder_set_extreme(void);
  

xz.spec

@@ -1,4 +1,6 @@
 %define	major	5
+%define	minor	0
+%define	micro	99
 %define	lname	lzma
 %define libname %mklibname %{lname} %{major}
 %define libdev  %mklibname -d %{lname}
@@ -8,13 +10,13 @@
 
 Summary: 	XZ utils
 Name: 		xz
-Version: 	5.0.3
+Version: 	5.1.1
-Release: 	2
+Release: 	0.alpha.2
 License: 	Public Domain
 Group:		Archiving/Compression
-Source0:	http://tukaani.org/xz/%{name}-%{version}.tar.xz
+Source0:	http://tukaani.org/xz/%{name}-%{version}alpha.tar.xz
 Source1:	xzme
-Patch0:		xz-5.0.0-text-tune.patch
+Patch0:		xz-5.1.1alpha-text-tune.patch
 %rename		lzma
 %rename		lzma-utils
 # needed by check suite
@@ -28,26 +30,26 @@ BuildRequires:	dietlibc-devel
 URL:		http://tukaani.org/xz/
 
 %description
-XZ provides very high compression ratio and fast decompression. The
+XZ Utils is free general-purpose data compression software with high
-core of the XZ utils is Igor Pavlov's LZMA SDK containing the actual
+compression ratio. XZ Utils were written for POSIX-like systems, but also
-LZMA encoder/decoder. LZMA utils add a few scripts which provide
+work on some not-so-POSIX systems.
-gzip-like command line interface and a couple of other XZ related
+XZ Utils are the successor to LZMA Utils.
-tools. Also provides:
 
-- Average compression ratio 30% better than that of gzip and 15%
+The core of the XZ Utils compression code is based on LZMA SDK,
-  better than that of bzip2.
+but it has been modified quite a lot to be suitable for XZ Utils.
+The primary compression algorithm is currently LZMA2, which is used inside
+the .xz container format. With typical files, XZ Utils create 30 % smaller
+output than gzip and 15 % smaller output than bzip2.
 
-- Decompression speed is only little slower than that of gzip, being
+XZ Utils consist of several components:
-  two to five times faster than bzip2.
 
-- In fast mode, compresses faster than bzip2 with a comparable
+* liblzma is a compression library with API similar to that of zlib.
-  compression ratio.
+* xz is a command line tool with syntax similar to that of gzip.
-
+* xzdec is a decompression-only tool smaller than the full-featured xz tool.
-- Achieving the best compression ratios takes four to even twelve
+* A set of shell scripts (xzgrep, xzdiff, etc.) have been adapted from gzip to
-  times longer than with bzip2. However. this doesn't affect
+ease viewing, grepping, and comparing compressed files.
-  decompressing speed.
+* Emulation of command line tools of LZMA Utils eases transition from LZMA
-
+Utils to XZ Utils.
-- Very similar command line interface than what gzip and bzip2 have.
 
 %package -n	%{libname}
 Summary:	Libraries for decoding XZ/LZMA compression
@@ -67,7 +69,7 @@ Requires:	%{libname} = %{version}
 Devel libraries & headers for liblzma.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}alpha
 %patch0 -p1 -b .text~
 
 %build
@@ -117,7 +119,7 @@ popd
 
 install -d %{buildroot}/%{_lib}
 mv %{buildroot}%{_libdir}/*.so.* %{buildroot}/%{_lib}/
-ln -sf ../../%{_lib}/liblzma.so.%{version} %{buildroot}%{_libdir}/liblzma.so
+ln -sf /%{_lib}/liblzma.so.%{major}.%{minor}.%{micro} %{buildroot}%{_libdir}/liblzma.so
 
 %if %{with uclibc}
 install -D objsuclibc/src/liblzma/.libs/liblzma.a -D %{buildroot}%{uclibc_root}%{_libdir}/liblzma.a
@@ -139,7 +141,8 @@ make check -C objs
 %{_mandir}/man1/*
 
 %files -n %{libname}
-/%{_lib}/lib*.so.%{major}*
+/%{_lib}/lib*.so.%{major}
+/%{_lib}/lib*.so.%{major}.%{minor}.%{micro}
 
 %files -n %{libdev}
 %{_includedir}/%{lname}.h
@@ -147,7 +150,6 @@ make check -C objs
 %{_includedir}/%{lname}/*.h
 %{_libdir}/*.so
 %{_libdir}/*.a
-%{_libdir}/*.la
 %if %{with dietlibc}
 %{_prefix}/lib/dietlibc/lib-%{_arch}/liblzma.a
 %endif
@@ -158,6 +160,18 @@ make check -C objs
 
 
 %changelog
+* Thu Mar 29 2012 Bogdano Arendartchuk <bogdano@mandriva.com> 5.1.1-0.alpha.2
++ Revision: 788234
+- remove .la files from the file list
+
+* Fri Oct 14 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 5.1.1-0.alpha.1
++ Revision: 704723
+- fix symlink creation for library moved to /%%{_lib}/
+- add missing file to %%files
+- s/macro/micro/ typo
+- new version
+- update description
+
 * Fri Jun 10 2011 Per Øyvind Karlsen <peroyvind@mandriva.org> 5.0.3-2
 + Revision: 684196
 - move shared library to /%%{_lib}/ (thx to Shlomi Fish for reporting)