- desc update

[packages/xz.git] / xz.spec

diff --git a/xz.spec b/xz.spec
index 54c140720fa6b1db573db8206f767819b5d8efa7..20354791b7cf8a3e835b690907a6ebe6d730cd33 100644 (file)
--- a/xz.spec
+++ b/xz.spec
@@ -1,17 +1,18 @@
 Summary:       LZMA Encoder/Decoder
 Summary(pl):   Koder/Dekoder LZMA
 Name:          lzma
-Version:       4.06
-Release:       2
-License:       LGPL
+Version:       4.42
+Release:       1
+License:       CPL/LGPL
 Group:         Applications/Archiving
-Source0:       http://www.7-zip.org/dl/%{name}406.zip
-# Source0-md5: a09378411cba5f786b5c49c9c58496df
-# Source0-size:        185934
+Source0:       http://puzzle.dl.sourceforge.net/sevenzip/%{name}442.tar.bz2
+# Source0-md5: 5274c2bbdac69834be636ad2eaf5bab5
 Patch0:                %{name}-quiet.patch
+Patch1:                %{name}427_zlib.patch
+Patch2:                %{name}-type-redefinition.patch
 URL:           http://www.7-zip.org/sdk.html
-BuildRequires: libstdc++-devel
 BuildRequires: gcc >= 5:3.4.0
+BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,7 +28,8 @@ LZMA features:
   - 8-12 MB/s on 1 GHz Intel Pentium 3 or AMD Athlon.
   - 500-1000 KB/s on 100 MHz ARM, MIPS, PowerPC or other simple RISC
     CPU.
-- Small memory requirements for decompressing: 8-32 KB
+- Small memory requirements for decompressing: 8-32 KB + dictionary
+  size
 - Small code size for decompressing: 2-8 KB (depending from speed
   optimizations)
 
@@ -44,40 +46,69 @@ Cechy LZMA:
   - 8-12 MB/s na 1 GHz Pentium 3 lub Athlonie,
   - 500-1000 KB/s na 100 MHz procesorach ARM, MIPS, PowerPC lub innych
     prostych RISC-ach,
-- Ma³a ilo¶æ pamiêci potrzebna do dekompresowania: 8-32 KB,
+- Ma³a ilo¶æ pamiêci potrzebna do dekompresowania: 8-32 KB + rozmiar
+  s³ownika,
 - Ma³y rozmiar kodu dekompresuj±cego: 2-8 KB (w zale¿no¶ci od opcji
   optymalizacji).
 
+%package devel
+Summary:        LZMA library
+Summary(pl):   Biblioteka LZMA
+Group:          Development/Libraries
+
+%description devel
+LZMA Library.
+
+%description devel -l pl
+Biblioteka LZMA.
+
 %prep
 %setup -q -c
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-cd SRC/7zip/Compress/LZMA_Alone
-%{__make} \
+cd C/7zip/Compress/LZMA_Alone
+%{__make} -f makefile.gcc \
        CXX="%{__cxx}" \
-       CFLAGS="%{rpmcflags} -fprofile-arcs -c" \
-       LDFLAGS="%{rpmldflags} -fprofile-arcs"
+       CXX_C="%{__cc}" \
+       CFLAGS="%{rpmcflags} -fprofile-generate -c -I ../../.." \
+       LDFLAGS="%{rpmldflags} -fprofile-generate" \
+       LIB="-lm -lgcov"
 
 cat ../LZMA/* > test1
 cat lzma *.o > test2
-./lzma e test1 test3
-./lzma e test2 test4
-./lzma d test3 test5
-./lzma d test4 test6
+tar cf test3 ../../../../*
+./lzma e test1 test4
+./lzma e test2 test5
+./lzma e test3 test6
+./lzma d test4 test7
+./lzma d test5 test8
+./lzma d test6 test9
+cmp test1 test7
+cmp test2 test8
+cmp test3 test9
 
-%{__make} clean
+%{__make} -f makefile.gcc clean
 
-%{__make} \
+%{__make} -f makefile.gcc \
        CXX="%{__cxx}" \
-       CFLAGS="%{rpmcflags} -fprofile-use -c" \
-       LDFLAGS="%{rpmldflags} -fprofile-use"
+       CXX_C="%{__cc}" \
+       CFLAGS="%{rpmcflags} -fprofile-use -c -I ../../.." \
+       LDFLAGS="%{rpmldflags}"
+
+cd ../LZMA_Lib
+%{__make} -f makefile \
+       CXX="%{__cxx}" \
+       CFLAGS="%{rpmcflags} -c"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}}
 
-install SRC/7zip/Compress/LZMA_Alone/lzma $RPM_BUILD_ROOT%{_bindir}
+install C/7zip/Compress/LZMA_Alone/lzma $RPM_BUILD_ROOT%{_bindir}
+install C/7zip/Compress/LZMA_Lib/liblzma.a $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,3 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc history.txt lzma.txt
 %attr(755,root,root) %{_bindir}/*
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/liblzma.a