RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 18-Sep-2014 07:07:03
Branch: rpm-5_4 Handle: 2014091805070003
Modified files: (Branch: rpm-5_4)
rpm CHANGES Makefile.am
rpm/lib rpmrc.c
rpm/rpmio Makefile.am librpmio.vers rpmlua.c rpmlua.h
rpm/ruby Makefile.am
rpm/scripts Makefile.am
Log:
- ruby: install into /usr/lib/rpm*/lib/ruby
- lua: install into /usr/lib/rpm*/lib/lua
- lua: initialize LUA_PATH and LUA_CPATH in order to load modules.
Summary:
Revision Changes Path
1.3501.2.445+3 -0 rpm/CHANGES
2.263.2.30 +7 -4 rpm/Makefile.am
2.289.4.5 +7 -2 rpm/lib/rpmrc.c
1.293.2.36 +11 -1 rpm/rpmio/Makefile.am
2.199.2.42 +2 -1 rpm/rpmio/librpmio.vers
2.76.4.12 +33 -6 rpm/rpmio/rpmlua.c
2.18.4.2 +4 -1 rpm/rpmio/rpmlua.h
1.11.2.4 +7 -4 rpm/ruby/Makefile.am
1.75.2.24 +8 -8 rpm/scripts/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.444 -r1.3501.2.445 CHANGES
--- rpm/CHANGES 17 Sep 2014 22:32:50 -0000 1.3501.2.444
+++ rpm/CHANGES 18 Sep 2014 05:07:00 -0000 1.3501.2.445
@@ -1,4 +1,7 @@
5.4.15 -> 5.4.16:
+ - jbj: ruby: install into /usr/lib/rpm*/lib/ruby
+ - jbj: lua: install into /usr/lib/rpm*/lib/lua
+ - jbj: lua: initialize LUA_PATH and LUA_CPATH in order to load modules.
- jbj: date: add date(1) object and macro embedding.
- jbj: rpmpgp: add pgpImplExport{Pubkey,Signature} vectors/wrappers.
- jbj: rpmpgp: switch to LibTomCrypt, default to ECDSA/SHA256 signing.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.263.2.29 -r2.263.2.30 Makefile.am
--- rpm/Makefile.am 8 Sep 2014 20:55:51 -0000 2.263.2.29
+++ rpm/Makefile.am 18 Sep 2014 05:07:00 -0000 2.263.2.30
@@ -179,13 +179,16 @@
done
endif
-pkgdatadir = @USRLIBRPM@
-pkgdata_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
+pkgdir = @USRLIBRPM@
+pkg_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
-pkgbindir = $(pkgdatadir)/bin
+pkgbindir = $(pkgdir)/bin
pkgbin_SCRIPTS = install-sh mkinstalldirs
-pkgcfgdir = $(pkgdatadir)/macros.d
+pkglibdir = $(pkgdir)/lib
+pkgsharedir = $(pkgdir)/share
+
+pkgcfgdir = $(pkgdir)/macros.d
pkgcfg_DATA = \
macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool \
macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php \
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.289.4.4 -r2.289.4.5 rpmrc.c
--- rpm/lib/rpmrc.c 29 Jul 2013 05:11:18 -0000 2.289.4.4
+++ rpm/lib/rpmrc.c 18 Sep 2014 05:07:01 -0000 2.289.4.5
@@ -1194,9 +1194,14 @@
fprintf(fp, "%-21s : %s\n", "luafiles", ((s && *s) ? s : "(not set)"));
s = _free(s);
/*@-globs@*/
- s = rpmExpand(rpmluaPath, NULL);
+ s = rpmExpand(rpmLUA_PATH, NULL);
/*@=globs@*/
- fprintf(fp, "%-21s : %s\n", "luapath", ((s && *s) ? s : "(not set)"));
+ fprintf(fp, "%-21s : %s\n", "LUA_PATH", ((s && *s) ? s : "(not set)"));
+ s = _free(s);
+/*@-globs@*/
+ s = rpmExpand(rpmLUA_CPATH, NULL);
+/*@=globs@*/
+ fprintf(fp, "%-21s : %s\n", "LUA_CPATH", ((s && *s) ? s : "(not set)"));
s = _free(s);
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.293.2.35 -r1.293.2.36 Makefile.am
--- rpm/rpmio/Makefile.am 17 Sep 2014 22:32:51 -0000 1.293.2.35
+++ rpm/rpmio/Makefile.am 18 Sep 2014 05:07:01 -0000 1.293.2.36
@@ -103,9 +103,19 @@
vg = $(LIBTOOL) --mode=execute vg
-#pkglibdir = @USRLIBRPM@
+pkgdir = @USRLIBRPM@
+
+pkgbindir = $(pkgdir)/bin
+
+pkglibdir = $(pkgdir)/lib
#pkglib_LTLIBRARIES = libsqlio.la
+pkgsharedir = $(pkgdir)/share
+
+luaCPATHdir = ${pkglibdir)/lua
+
+luaLPATHdir = ${pkgsharedir)/lua
+
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
pkginc_HEADERS = argv.h mire.h rpmzlog.h yarn.h \
rpmbf.h rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h rpmpgp.h
rpmsw.h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.199.2.41 -r2.199.2.42 librpmio.vers
--- rpm/rpmio/librpmio.vers 17 Sep 2014 22:32:51 -0000 2.199.2.41
+++ rpm/rpmio/librpmio.vers 18 Sep 2014 05:07:01 -0000 2.199.2.42
@@ -571,8 +571,9 @@
rpmlogSetFile;
rpmlogSetMask;
rpmltcImplVecs;
+ rpmLUA_PATH;
+ rpmLUA_CPATH;
rpmluaFiles;
- rpmluaPath;
rpmluaCheckScript;
rpmluaDelVar;
rpmluaFiles;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.76.4.11 -r2.76.4.12 rpmlua.c
--- rpm/rpmio/rpmlua.c 4 Sep 2014 16:26:41 -0000 2.76.4.11
+++ rpm/rpmio/rpmlua.c 18 Sep 2014 05:07:01 -0000 2.76.4.12
@@ -99,8 +99,22 @@
/*@unchecked@*/ /*@observer@*/
const char * rpmluaFiles = RPMLUAFILES;
+/* See LUA_{PATH,CPATH} in lua/luaconf.h. */
+#define RPMLUA_VDIR "/"
+#define RPMLUA_ROOT "%{?_rpmhome}%{!?_rpmhome:" USRLIBRPM "}"
+#define RPMLUA_LDIR LUA_ROOT "share/lua/" RPMLUA_VDIR
+#define RPMLUA_CDIR LUA_ROOT "lib/lua/" RPMLUA_VDIR
+#define RPMLUA_PATH_DEFAULT \
+ RPMLUA_LDIR"?.lua;" RPMLUA_LDIR"?/init.lua;" \
+ RPMLUA_CDIR"?.lua;" RPMLUA_CDIR"?/init.lua;" "./?.lua"
+#define RPMLUA_CPATH_DEFAULT \
+ RPMLUA_CDIR"?.so;" RPMLUA_CDIR"loadall.so;" "./?.so"
+
+/*@unchecked@*/ /*@observer@*/
+const char * rpmLUA_PATH = RPMLUA_PATH_DEFAULT LUA_PATH_DEFAULT;
+
/*@unchecked@*/ /*@observer@*/
-const char * rpmluaPath = "%{?_rpmhome}%{!?_rpmhome:" USRLIBRPM
"}/lua/?.lua";
+const char * rpmLUA_CPATH = RPMLUA_CPATH_DEFAULT LUA_CPATH_DEFAULT;
rpmlua rpmluaGetGlobalState(void)
{
@@ -196,17 +210,30 @@
lua_pop(L, 1);
}
- { const char * _lua_path = rpmGetPath(rpmluaPath, NULL);
- if (_lua_path != NULL) {
+ { const char * RPMLUA_PATH = rpmGetPath(rpmLUA_PATH, NULL);
+ if (RPMLUA_PATH != NULL) {
#if defined(LUA_GLOBALSINDEX)
lua_pushliteral(L, "LUA_PATH");
- lua_pushstring(L, _lua_path);
+ lua_pushstring(L, RPMLUA_PATH);
lua_rawset(L, LUA_GLOBALSINDEX);
#else
- lua_pushstring(L, _lua_path);
+ lua_pushstring(L, RPMLUA_PATH);
lua_setglobal(L, "LUA_PATH");
#endif
- _lua_path = _free(_lua_path);
+ RPMLUA_PATH = _free(RPMLUA_PATH);
+ }
+ }
+ { const char * RPMLUA_CPATH = rpmGetPath(rpmLUA_CPATH, NULL);
+ if (RPMLUA_CPATH != NULL) {
+#if defined(LUA_GLOBALSINDEX)
+ lua_pushliteral(L, "LUA_CPATH");
+ lua_pushstring(L, RPMLUA_CPATH);
+ lua_rawset(L, LUA_GLOBALSINDEX);
+#else
+ lua_pushstring(L, RPMLUA_CPATH);
+ lua_setglobal(L, "LUA_CPATH");
+#endif
+ RPMLUA_CPATH = _free(RPMLUA_CPATH);
}
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.h
============================================================================
$ cvs diff -u -r2.18.4.1 -r2.18.4.2 rpmlua.h
--- rpm/rpmio/rpmlua.h 17 Aug 2014 13:15:15 -0000 2.18.4.1
+++ rpm/rpmio/rpmlua.h 18 Sep 2014 05:07:02 -0000 2.18.4.2
@@ -61,7 +61,10 @@
extern const char * rpmluaFiles;
/*@unchecked@*/ /*@observer@*/
-extern const char * rpmluaPath;
+extern const char * rpmLUA_PATH;
+
+/*@unchecked@*/ /*@observer@*/
+extern const char * rpmLUA_CPATH;
/*@-exportlocal@*/
/*@only@*/ /*@exposed@*/ /*@relnull@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/ruby/Makefile.am
============================================================================
$ cvs diff -u -r1.11.2.3 -r1.11.2.4 Makefile.am
--- rpm/ruby/Makefile.am 2 Jul 2013 16:29:08 -0000 1.11.2.3
+++ rpm/ruby/Makefile.am 18 Sep 2014 05:07:02 -0000 1.11.2.4
@@ -45,11 +45,14 @@
$(top_builddir)/build/librpmbuild.la \
$(RPM_LDADD_COMMON)
-pkglibdir = @USRLIBRPM@/lib
-pkgbindir = @USRLIBRPM@/bin
-
+pkgdir = @USRLIBRPM@
+pkgbindir = $(pkgdir)/bin
pkgbin_PROGRAMS = trb
-pkglib_LTLIBRARIES = rpm.la
+
+pkglibdir = $(pkgdir)/lib
+
+rubylibdir = $(pkglibdir)/ruby
+rubylib_LTLIBRARIES = rpm.la
rpm_la_CFLAGS = -fno-strict-aliasing
rpm_la_LDFLAGS = -module -avoid-version
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.75.2.23 -r1.75.2.24 Makefile.am
--- rpm/scripts/Makefile.am 15 Aug 2014 07:42:06 -0000 1.75.2.23
+++ rpm/scripts/Makefile.am 18 Sep 2014 05:07:03 -0000 1.75.2.24
@@ -53,8 +53,8 @@
noinst_SCRIPTS += check-multiarch-files mkmultiarch
-pkgdatadir = @USRLIBRPM@
-pkgdata_SCRIPTS = \
+pkgdir = @USRLIBRPM@
+pkg_SCRIPTS = \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
@@ -74,14 +74,14 @@
vcheck vpkg-provides.sh vpkg-provides2.sh
-pkglibbindir = @USRLIBRPM@/bin
-pkglibbin_SCRIPTS = api-sanity-autotest.pl api-sanity-checker.pl mgo pom2spec
+pkgbindir = @USRLIBRPM@/bin
+pkgbin_SCRIPTS = api-sanity-autotest.pl api-sanity-checker.pl mgo pom2spec
-pkglibhelperdir = @USRLIBRPM@/helpers
-pkglibhelper_SCRIPTS = ${HELPERS}
+pkghelperdir = @USRLIBRPM@/helpers
+pkghelper_SCRIPTS = ${HELPERS}
-pkglibqfdir = @USRLIBRPM@/qf
-pkglibqf_DATA = \
+pkgqfdir = @USRLIBRPM@/qf
+pkgqf_DATA = \
deb_Packages deb_Sources \
deb_control deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \
nix_meta psq_pkgng_yaml \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
