Update to 5.2.3

[packages/xz.git] / xz.spec

diff --git a/xz.spec b/xz.spec
index 740f408287f04bb44037c734f65383344e710636..5568f664db6a1f0b1e7627f1edc8de294bf9e8b1 100644 (file)
--- a/xz.spec
+++ b/xz.spec
@@ -1,19 +1,40 @@
-# TODO:
-# - wait for alpha7 which will fix headers installation issue
-%define        snap    alpha
+#
+# Conditional build:
+%bcond_without tests   # don't perform make check
+%bcond_without asm     # ix86 asm optimizations
+
+%ifnarch %{ix86}
+# Speed-optimized CRC64 using slicing-by-four algorithm. This uses only i386
+# instructions, but it is optimized for i686 and later (including e.g. Pentium
+# II/III/IV, Athlon XP, and Core 2).
+%undefine      with_asm
+%endif
+
+%if "%{pld_release}" == "ac"
+%undefine      with_asm
+%endif
+
 Summary:       LZMA Encoder/Decoder
 Summary(pl.UTF-8):     Koder/Dekoder LZMA
-Name:          lzma
-Version:       4.42.2
-Release:       0.%{snap}.1
+Name:          xz
+Version:       5.2.3
+Release:       1
 Epoch:         1
-License:       GPL v3+/GPL v2+/GPL v2.1+/Public Domain
+License:       LGPL v2.1+, helper scripts on GPL v2+
 Group:         Applications/Archiving
-Source0:       http://tukaani.org/lzma/%{name}-%{version}%{snap}.tar.gz
-# Source0-md5: 5cef8b41aecee8ce1c6fbc681701fe61
-URL:           http://tukaani.org/lzma/
-BuildRequires: libstdc++-devel
-# does not need -libs, due apps being not linked with shared lib
+Source0:       http://tukaani.org/xz/%{name}-%{version}.tar.bz2
+# Source0-md5: 1592e7ca3eece099b03b35f4d9179e7c
+Patch0:                %{name}-parallel.patch
+Patch1:                %{name}-memlimit.patch
+URL:           http://tukaani.org/xz/
+%{?with_asm:BuildRequires:     gcc >= 5:3.4}
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpmbuild(macros) >= 1.402
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Suggests:      mktemp
+Provides:      lzma = %{epoch}:%{version}-%{release}
+Obsoletes:     lzma < 1:4.999.6
+Conflicts:     rpm < 4.4.9
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,6 +77,8 @@ Cechy LZMA:
 Summary:       LZMA shared library
 Summary(pl.UTF-8):     Biblioteka współdzielona LZMA
 Group:         Libraries
+Provides:      lzma-libs = %{epoch}:%{version}-%{release}
+Obsoletes:     lzma-libs < 1:4.999.6
 
 %description libs
 LZMA shared library.
@@ -68,6 +91,8 @@ Summary:      Header file for LZMA library
 Summary(pl.UTF-8):     Plik nagłówkowy biblioteki LZMA
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Provides:      lzma-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     lzma-devel < 1:4.999.6
 
 %description devel
 Header file for LZMA library.
@@ -80,6 +105,8 @@ Summary:     LZMA static library
 Summary(pl.UTF-8):     Biblioteka statyczna LZMA
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Provides:      lzma-static = %{epoch}:%{version}-%{release}
+Obsoletes:     lzma-static < 1:4.999.6
 
 %description static
 LZMA static library.
@@ -88,19 +115,33 @@ LZMA static library.
 Biblioteka statyczna LZMA.
 
 %prep
-%setup -q -n %{name}-%{version}%{snap}
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-%configure
-
+%configure \
+       %{!?with_asm:--disable-assembler}
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
+install -d $RPM_BUILD_ROOT{/etc/env.d,/%{_lib}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a doc/examples*  $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+mv -f $RPM_BUILD_ROOT%{_libdir}/liblzma.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/liblzma.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/liblzma.so
+
+echo '#XZ_OPT="--threads=2"' > $RPM_BUILD_ROOT/etc/env.d/XZ_OPT
+
 %find_lang %{name}
 
 %clean
@@ -109,24 +150,34 @@ rm -rf $RPM_BUILD_ROOT
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-
-%files libs -f %{name}.lang
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/XZ_OPT
+%attr(755,root,root) %{_bindir}/lz*
+%attr(755,root,root) %{_bindir}/unlzma
+%attr(755,root,root) %{_bindir}/unxz
+%attr(755,root,root) %{_bindir}/xz*
+%{_mandir}/man1/lz*.1*
+%{_mandir}/man1/unlzma.1*
+%{_mandir}/man1/unxz.1*
+%{_mandir}/man1/xz*.1*
+
+%files libs
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING* NEWS README* THANKS TODO
-%attr(755,root,root) %{_libdir}/lib*.so.*
+%doc AUTHORS COPYING README THANKS
+%doc doc/*.txt
+%attr(755,root,root) /%{_lib}/liblzma.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/liblzma.so.5
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/*.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/liblzma.so
+%{_libdir}/liblzma.la
+%{_includedir}/lzma.h
 %{_includedir}/lzma
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/liblzma.pc
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/liblzma.a