RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 25-Mar-2011 17:22:42
Branch: rpm-5_4 Handle: 2011032516224101
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/lib rpmluaext.c
Log:
permit in configure phase to enable the
--enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today
and, for rpm.vercmp, by rpm.org (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
Submitted by: Elia Pinto
Summary:
Revision Changes Path
1.3501.2.76 +3 -0 rpm/CHANGES
2.472.2.10 +13 -0 rpm/configure.ac
2.8.6.1 +1 -1 rpm/lib/rpmluaext.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.75 -r1.3501.2.76 CHANGES
--- rpm/CHANGES 24 Mar 2011 21:26:14 -0000 1.3501.2.75
+++ rpm/CHANGES 25 Mar 2011 16:22:41 -0000 1.3501.2.76
@@ -1,4 +1,7 @@
5.4.0 -> 5.4.1:
+ - devzero2000: permit in configure phase to enable the
+ --enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today
+ and, for rpm.vercmp, by rpm.org (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
- jbj: add a --nofsync popt alias (caveat: experimental & risky).
- jbj: checksig: check explictly for per-item failures after iterating.
- proyvind: always run %clean so it won't be required in .spec file.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.9 -r2.472.2.10 configure.ac
--- rpm/configure.ac 24 Mar 2011 22:44:02 -0000 2.472.2.9
+++ rpm/configure.ac 25 Mar 2011 16:22:42 -0000 2.472.2.10
@@ -364,6 +364,19 @@
])
+dnl # Adds RPM Lua extensions based on rpmlib functionality
+AC_ARG_ENABLE(
+ [rpm-lua-extensions-based-on-rpmlib],
+ AS_HELP_STRING([--enable-rpm-lua-extensions-based-on-rpmlib],[Adds RPM
Lua extensions based on rpmlib functionality (default:no)]),
+ [ do_rpm_lua_extensions_based_on_rpmlib=$enableval ],
+ [ do_rpm_lua_extensions_based_on_rpmlib=no ])
+
+AS_IF([test "x$do_rpm_lua_extensions_based_on_rpmlib" != xno],
+ [
+ AC_DEFINE([RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB],[1],[Adds RPM Lua
extensions based on rpmlib functionality])
+ ])
+
+
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmluaext.c
============================================================================
$ cvs diff -u -r2.8 -r2.8.6.1 rpmluaext.c
--- rpm/lib/rpmluaext.c 26 Mar 2009 18:07:31 -0000 2.8
+++ rpm/lib/rpmluaext.c 25 Mar 2011 16:22:42 -0000 2.8.6.1
@@ -2,7 +2,7 @@
* \file lib/rpmluaext.c
*/
-#if defined(RPM_VENDOR_OPENPKG) /*
rpm-lua-extensions-based-on-rpm-lib-functionality */
+#if defined(RPM_VENDOR_OPENPKG) ||
defined(RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB) /*
rpm-lua-extensions-based-on-rpm-lib-functionality */
#include "system.h"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
