SPECS: rpm.spec - require newer lzma since it segfaults with old one; don't...

[arekm]

Author: arekm                        Date: Tue Jul 29 19:00:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- require newer lzma since it segfaults with old one; don't overwrite cppflags

---- Files affected:
SPECS:
   rpm.spec (1.906 -> 1.907) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.906 SPECS/rpm.spec:1.907
--- SPECS/rpm.spec:1.906	Tue Jul 29 20:42:53 2008
+++ SPECS/rpm.spec	Tue Jul 29 20:59:56 2008
@@ -9,8 +9,7 @@
 #          i386 i386
 # - python(abi) cap is not provided automatically because /usr/lib*/libpython2*.so.*
 #   matches ELF first
-# - repackaging when lzma is not installed (todo: fix digest signature of header)
-#   rpmbuild computes digest when writing package to temporary file, then adds a few
+# - rpmbuild computes digest when writing package to temporary file, then adds a few
 #   tags (incl. digest) and writes whole package to destination file;
 #   repackaging uses unchanged "immutable header" image from original rpm, also
 #   preserving payload format and compressor from original rpm, _not_ current settings
@@ -155,7 +154,7 @@
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	gettext-autopoint >= 0.11.4-2
 BuildRequires:	gettext-devel >= 0.11.4-2
-BuildRequires:	lzma-devel >= 4.42.2
+BuildRequires:	lzma-devel >= 4.999.3
 BuildRequires:	libmagic-devel
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
@@ -202,6 +201,8 @@
 Conflicts:	glibc < 2.2.92
 # db4.6 poldek needed
 Conflicts:	poldek < 0.21-0.20070703.00.3
+# segfaults with lzma 0.42.2
+Conflicts:	lzma-libs < 4.999.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_binary_payload		w9.gzdio
@@ -730,7 +731,7 @@
 # rpm checks for CPU type at runtime, but it looks better
 #sed -i -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' -e 's|@host_cpu@|%{_target_cpu}|' macros.in
 
-%{?with_system_lua:CPPFLAGS=-I/usr/include/lua51}
+%{?with_system_lua:CPPFLAGS="-I/usr/include/lua51 %{rpmcppflags}"}
 # pass CC and CXX too in case of building with some older configure macro
 %configure \
 	CC="%{__newcc}" \
@@ -1332,6 +1333,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.907  2008/07/29 18:59:56  arekm
+- require newer lzma since it segfaults with old one; don't overwrite cppflags
+
 Revision 1.906  2008/07/29 18:42:53  arekm
 - drop rpm-repackage-wo-lzma.patch hack
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.906&r2=1.907&f=u