RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 05-Jun-2008 20:11:16
Branch: rpm-5_0 Handle: 2008060518111600
Modified files: (Branch: rpm-5_0)
rpm CHANGES configure.ac devtool.conf
Log:
- devtool system: enable --with-pcre.
- devtool system: backport and enable --with-uuid (w/o lua for now).
Summary:
Revision Changes Path
1.2054.2.83 +2 -0 rpm/CHANGES
2.269.2.11 +11 -0 rpm/configure.ac
2.170.2.5 +2 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2054.2.82 -r1.2054.2.83 CHANGES
--- rpm/CHANGES 5 Jun 2008 15:42:05 -0000 1.2054.2.82
+++ rpm/CHANGES 5 Jun 2008 18:11:16 -0000 1.2054.2.83
@@ -1,4 +1,6 @@
5.0.3 -> 5.0.4:
+ - jbj: devtool system: enable --with-pcre.
+ - jbj: devtool system: backport and enable --with-uuid (w/o lua for now).
- jbj: add expanded build scripts for --specsrpm --queryformat spewage.
- jbj: fix: is_selinux_enbled() > 0 is the correct test.
- rpm.org: Mask signals while moving rebuilt rpmdb into place.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.269.2.10 -r2.269.2.11 configure.ac
--- rpm/configure.ac 31 May 2008 22:00:31 -0000 2.269.2.10
+++ rpm/configure.ac 5 Jun 2008 18:11:16 -0000 2.269.2.11
@@ -1090,6 +1090,17 @@
fi
], [])
+dnl # OSSP uuid
+RPM_CHECK_LIB(
+ [OSSP uuid], [uuid],
+ [ossp-uuid uuid], [uuid_import], [uuid.h],
+ [no,external:none], [],
+ [ dnl # enable OSSP uuid native API support for embedded Lua
+# if test ".$WITH_LUA" = .yes; then
+# WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_UUID"
+# fi
+ ], [])
+
dnl # XAR
RPM_CHECK_LIB(
[XAR], [xar],
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.170.2.4 -r2.170.2.5 devtool.conf
--- rpm/devtool.conf 31 May 2008 22:00:48 -0000 2.170.2.4
+++ rpm/devtool.conf 5 Jun 2008 18:11:16 -0000 2.170.2.5
@@ -76,6 +76,8 @@
--with-beecrypt=external \
--with-nss=external \
--with-neon=external \
+ --with-pcre=external \
+ --with-uuid=external \
--with-xar=internal \
--with-bzip2=external \
--with-popt=external \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
