SPECS (AC-branch): lzma.spec - merged changes from HEAD (includes ...

[glen]

Author: glen                         Date: Mon Oct 30 20:42:34 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged changes from HEAD (includes liblzma.a now)

---- Files affected:
SPECS:
   lzma.spec (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SPECS/lzma.spec
diff -u SPECS/lzma.spec:1.1.2.2 SPECS/lzma.spec:1.1.2.3
--- SPECS/lzma.spec:1.1.2.2	Mon Oct 30 21:35:53 2006
+++ SPECS/lzma.spec	Mon Oct 30 21:42:29 2006
@@ -1,14 +1,17 @@
 # $Revision$, $Date$
+# TODO
+# - devel contains shared library. move to -static.
 Summary:	LZMA Encoder/Decoder
 Summary(pl):	Koder/Dekoder LZMA
 Name:		lzma
 Version:	4.43
 Release:	1
-License:	LGPL
+License:	CPL/LGPL
 Group:		Applications/Archiving
 Source0:	http://dl.sourceforge.net/sevenzip/%{name}443.tar.bz2
 # Source0-md5:	c4e1b467184c7cffd4371c74df2baf0f
 Patch0:		%{name}-quiet.patch
+Patch1:		%{name}427_zlib.patch
 URL:		http://www.7-zip.org/sdk.html
 BuildRequires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,7 +29,8 @@
   - 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)
 
@@ -43,28 +47,68 @@
   - 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
 
 %build
 cd C/7zip/Compress/LZMA_Alone
+%{__make} -f makefile.gcc \
+	CXX="%{__cxx}" \
+	CXX_C="%{__cc}" \
+	CFLAGS="%{rpmcflags} -c -I ../../.." \
+	LDFLAGS="%{rpmldflags}" \
+	LIB="-lm"
+
+cat ../LZMA/* > test1
+cat lzma *.o > test2
+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} -f makefile.gcc clean
 
 %{__make} -f makefile.gcc \
-		CXX="%{__cxx}" \
-		CXX_C="%{__cc}" \
-		CFLAGS="%{rpmcflags} -c -I ../../.." \
-		LDFLAGS="%{rpmldflags}"
+	CXX="%{__cxx}" \
+	CXX_C="%{__cc}" \
+	CFLAGS="%{rpmcflags} -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 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
@@ -74,12 +118,19 @@
 %doc history.txt lzma.txt
 %attr(755,root,root) %{_bindir}/*
 
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/liblzma.a
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.3  2006/10/30 20:42:29  glen
+- merged changes from HEAD (includes liblzma.a now)
+
 Revision 1.1.2.2  2006/10/30 20:35:53  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/lzma.spec?r1=1.1.2.2&r2=1.1.2.3&f=u