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

[glen]

Author: glen                         Date: Wed Nov  1 13:53:39 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged changes from HEAD

---- Files affected:
SPECS:
   lzma.spec (1.1.2.6 -> 1.1.2.7) 

---- Diffs:

================================================================
Index: SPECS/lzma.spec
diff -u SPECS/lzma.spec:1.1.2.6 SPECS/lzma.spec:1.1.2.7
--- SPECS/lzma.spec:1.1.2.6	Mon Oct 30 22:13:14 2006
+++ SPECS/lzma.spec	Wed Nov  1 14:53:34 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Koder/Dekoder LZMA
 Name:		lzma
 Version:	4.43
-Release:	2
+Release:	5
 License:	CPL/LGPL
 Group:		Applications/Archiving
 Source0:	http://dl.sourceforge.net/sevenzip/%{name}443.tar.bz2
@@ -11,6 +11,7 @@
 Patch0:		%{name}-quiet.patch
 Patch1:		%{name}427_zlib.patch
 Patch2:		%{name}-shared.patch
+Patch3:		%{name}-lzmalib.patch
 URL:		http://www.7-zip.org/sdk.html
 BuildRequires:	libstdc++-devel
 # does not need -libs, due apps being not linked with shared lib
@@ -76,7 +77,7 @@
 Summary:	LZMA static library
 Summary(pl):	Biblioteka LZMA
 Group:		Development/Libraries
-# does not need -devel due it containing only library.
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static LZMA Library.
@@ -86,6 +87,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cd C/7zip/Compress/LZMA_Alone
@@ -124,9 +126,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}}
 
 install C/7zip/Compress/LZMA_Alone/lzma $RPM_BUILD_ROOT%{_bindir}
+install C/7zip/Compress/LZMA_Lib/lzmalib.h $RPM_BUILD_ROOT%{_includedir}
 install C/7zip/Compress/LZMA_Lib/liblzma.a $RPM_BUILD_ROOT%{_libdir}
 install C/7zip/Compress/LZMA_Lib/liblzma.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
 ln -s $(cd C/7zip/Compress/LZMA_Lib; echo liblzma.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/liblzma.so
@@ -148,6 +151,7 @@
 
 %files devel
 %defattr(644,root,root,755)
+%{_includedir}/lzmalib.h
 %{_libdir}/liblzma.so
 
 %files static
@@ -160,6 +164,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.7  2006/11/01 13:53:34  glen
+- merged changes from HEAD
+
 Revision 1.1.2.6  2006/10/30 21:13:14  glen
 - corrected -devel deps
 
================================================================

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