RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 19-Sep-2010 05:28:52
Branch: rpm-5_3 Handle: 2010091903285001
Added files: (Branch: rpm-5_3)
rpm/scripts ruby-config wdj_srpm_mongo
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/scripts Makefile.am
Log:
- autofu: hot-wire ruby-1.9.2p0 embedding.
- ruby: add a ruby-config helper for RPM_CHECK_LIB().
Summary:
Revision Changes Path
1.3296.2.74 +2 -0 rpm/CHANGES
2.432.2.17 +1 -4 rpm/configure.ac
1.65.2.2 +3 -3 rpm/scripts/Makefile.am
1.1.2.1 +57 -0 rpm/scripts/ruby-config
1.1.2.2 +25 -0 rpm/scripts/wdj_srpm_mongo
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.73 -r1.3296.2.74 CHANGES
--- rpm/CHANGES 18 Sep 2010 19:47:28 -0000 1.3296.2.73
+++ rpm/CHANGES 19 Sep 2010 03:28:50 -0000 1.3296.2.74
@@ -1,4 +1,6 @@
5.3.3 -> 5.3.4:
+ - jbj: autofu: hot-wire ruby-1.9.2p0 embedding.
+ - jbj: ruby: add a ruby-config helper for RPM_CHECK_LIB().
- jbj: tests: mark mtree breakage on rhel6 for fixing.
- jbj: mongo: handle endianness at runtime, remove MONGO_BIG_ENDIAN.
- jbj: mongo: replace internal md5 digest with rpmDigestInit().
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.432.2.16 -r2.432.2.17 configure.ac
--- rpm/configure.ac 18 Sep 2010 18:25:03 -0000 2.432.2.16
+++ rpm/configure.ac 19 Sep 2010 03:28:51 -0000 2.432.2.17
@@ -1484,17 +1484,14 @@
dnl # Ruby
WITH_RUBY_SUBDIR=""
-WITH_RUBY_CPPFLAGS=""
RPM_CHECK_LIB(
[Ruby], [ruby],
- [ruby], [ruby_init], [ruby.h],
+ [ruby-static], [ruby_init], [ruby.h],
[no,external:none], [],
[ AC_DEFINE(WITH_RUBYEMBED, 1, [Define to 1 if you want embedded Ruby])
WITH_RUBY_SUBDIR=ruby
- WITH_RUBY_CPPFLAGS="-I`ruby -rrbconfig -e 'puts RbConfig::expand(RbConfig::CONFIG[[\"rubyhdrdir\"]])'` -I`ruby -rrbconfig -e 'puts RbConfig::expand(\"#{RbConfig::CONFIG[\"rubyhdrdir\"]}/$(arch)\")'`"
], [])
AC_SUBST(WITH_RUBY_SUBDIR)
-AC_SUBST(WITH_RUBY_CPPFLAGS)
dnl # Squirrel
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.65.2.1 -r1.65.2.2 Makefile.am
--- rpm/scripts/Makefile.am 24 May 2010 11:33:12 -0000 1.65.2.1
+++ rpm/scripts/Makefile.am 19 Sep 2010 03:28:51 -0000 1.65.2.2
@@ -27,10 +27,10 @@
php.prov php.req rpm2cpio \
rpmdb_loadcvt rpmdiff rpmdiff.cgi \
rpm.daily rpm.log rpm.xinetd \
- rpmsort rt-reloc-wrapper.sh symset-table \
+ rpmsort rt-reloc-wrapper.sh ruby-config symset-table \
sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \
vcheck vpkg-provides.sh vpkg-provides2.sh \
- wdj_srpm \
+ wdj_srpm wdj_srpm_mongo \
wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml \
xiu_stdenv \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
@@ -71,7 +71,7 @@
deb_Packages deb_Sources \
deb_control deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \
nix_meta \
- wdj_srpm \
+ wdj_srpm wdj_srpm_mongo \
wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml \
xiu_stdenv \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/ruby-config
============================================================================
$ cvs diff -u -r0 -r1.1.2.1 ruby-config
--- /dev/null 2010-09-19 05:22:01.000000000 +0200
+++ ruby-config 2010-09-19 05:28:52.371608970 +0200
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+prefix=/usr/lib/rpm
+exec_prefix=/usr/lib/rpm
+exec_prefix_set=no
+includedir="${prefix}/include"
+libdir="${prefix}/lib"
+version=1.9.1
+platform=i686-linux
+
+usage="\
+Usage: ruby-config [--prefix] [--exec-prefix] [--version] [--cppflags] [--libs]"
+
+if test $# -eq 0; then
+ echo "${usage}" 1>&2
+ exit 1
+fi
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix=*)
+ prefix=$optarg
+ if test $exec_prefix_set = no ; then
+ exec_prefix=$optarg
+ fi
+ ;;
+ --prefix)
+ echo $prefix
+ ;;
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ exec_prefix_set=yes
+ ;;
+ --exec-prefix)
+ echo $exec_prefix
+ ;;
+ --version)
+ echo "${version}"
+ ;;
+ --cppflags)
+ echo "-I${includedir}/ruby-${version}/ -I${includedir}/ruby-${version}/${platform}/"
+ ;;
+ --libs)
+ echo "-L${libdir}/ -lruby-static -lcrypt"
+ ;;
+ *)
+ echo "${usage}" 1>&2
+ exit 1
+ ;;
+ esac
+ shift
+done
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/wdj_srpm_mongo
============================================================================
$ cvs diff -u -r0 -r1.1.2.2 wdj_srpm_mongo
--- /dev/null 2010-09-19 05:22:01.000000000 +0200
+++ wdj_srpm_mongo 2010-09-19 05:28:52.401609989 +0200
@@ -0,0 +1,25 @@
+"\
+db.srpm.save(\{
+ NVRA: '%{NVRA}',
+ License: '%{LICENSE}',
+ Distribution: '%{DISTRIBUTION}',
+ Vendor: '%{VENDOR}',
+ Packager: '%{PACKAGER}',
+ Group: '%{GROUP}',
+ Url: '%{URL}',
+ Size: %{SIZE},
+ Archivesize: %{ARCHIVESIZE},
+ Rpmversion: '%{RPMVERSION}',
+ Buildtime: %{BUILDTIME},
+ Buildhost: '%{BUILDHOST}',
+ Sourcerpm: '%{SOURCERPM}',
+ Hdrid: '%{HDRID}',
+ Optflags: '%{OPTFLAGS}',
+ Payloadformat: '%{PAYLOADFORMAT}',
+ Payloadcompressor: '%{PAYLOADCOMPRESSOR}',
+ Filedigestalgo: %{FILEDIGESTALGO},
+ Packagecolor: %{PACKAGECOLOR},
+ InstallTID: %{INSTALLTID},
+ Installcolor: %{INSTALLCOLOR}
+\})
+"
@@ .
Received on Sun Sep 19 05:28:52 2010