Author: glen Date: Tue Feb 19 19:06:53 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- bcond for system lua
- disabled as rpm i can't install it with previously built rpm5 here
---- Files affected:
SPECS:
rpm.spec (1.876 -> 1.877)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.876 SPECS/rpm.spec:1.877
--- SPECS/rpm.spec:1.876 Sun Feb 17 20:25:13 2008
+++ SPECS/rpm.spec Tue Feb 19 20:06:48 2008
@@ -35,6 +35,7 @@
%bcond_without db # BerkeleyDB
%bcond_with sqlite # build with SQLite support
%bcond_with sqlite_dbapi # default database backend is sqlite
+%bcond_with system_lua # use system lua
# force_cc - force using __cc other than
"%{_target_cpu}-pld-linux-gcc"
# force_cxx - force using __cxx other than
"%{_target_cpu}-pld-linux-g++"
# force_cpp - force using __cpp other than
"%{_target_cpu}-pld-linux-gcc -E"
@@ -63,7 +64,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.0.2
-Release: 0.2
+Release: 0.3
License: LGPL
Group: Base
Source0: http://rpm5.org/files/rpm/rpm-5.0/%{name}-%{version}.tar.gz
@@ -110,6 +111,7 @@
Patch8: %{name}-php-macros.patch
Patch9: %{name}-gettext-in-header.patch
Patch10: %{name}-compress-doc.patch
+Patch11: %{name}-lua.patch
Patch14: %{name}-etc_dir.patch
Patch16: %{name}-php-deps.patch
@@ -141,7 +143,7 @@
Patch61: %{name}-sparc64.patch
URL: http://rpm5.org/
-BuildRequires: autoconf >= 2.57
+BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1.4
BuildRequires: beecrypt-devel >= %{beecrypt_ver}
BuildRequires: bzip2-devel >= 1.0.2-17
@@ -160,6 +162,7 @@
%endif
BuildRequires: patch >= 2.2
BuildRequires: popt-devel >= %{reqpopt_ver}
+%{?with_system_lua:BuildRequires: lua51-devel >= 5.1.2}
%{?with_python:BuildRequires: python-devel >= 1:2.3}
BuildRequires: python-modules >= 1:2.3
BuildRequires: rpm-perlprov
@@ -635,6 +638,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%{?with_system_lua:%patch11 -p1}
# CHECK ME - macrofiles: ~/etc could be used
#%%patch14 -p1
%patch16 -p1
@@ -699,8 +703,8 @@
# 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}
# pass CC and CXX too in case of building with some older configure macro
-# disable perl-RPM2 build, we have it in separate spec
%configure \
CC="%{__newcc}" \
CXX="%{__newcxx}" \
@@ -722,7 +726,7 @@
--with-db=%{?with_db:external}%{!?with_db:no} \
--with-sqlite=%{?with_sqlite:external}%{!?with_sqlite:no} \
--with-dbapi=%{!?with_sqlite_dbapi:db}%{?with_sqlite_dbapi:sqlite} \
- --with-lua=internal \
+ --with-lua=%{!?with_system_lua:internal}%{?with_system_lua:external} \
--with-pcre=no \
--with-keyutils=none \
--without-path-versioned \
@@ -1260,6 +1264,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.877 2008-02-19 19:06:48 glen
+- bcond for system lua
+- disabled as rpm i can't install it with previously built rpm5 here
+
Revision 1.876 2008-02-17 19:25:13 glen
- no -feliminate-dwarf2-dups used
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.876&r2=1.877&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
