Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ccfaf866ba75a090b2c534b93e7e128eade2d741)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ccfaf866ba75a090b2c534b93e7e128eade2d741)
  • Date: Wed, 5 Jul 2006 01:49:59 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

archive/rpm/BUILD | 3 ++-
archive/rpm/CONFIGURE | 2 +-
archive/rpm/DEPENDS | 2 +-
archive/rpm/HISTORY | 3 +++
archive/rpm/PRE_BUILD | 10 ----------
python-devel/itools/DETAILS | 4 ++--
python-devel/itools/HISTORY | 3 +++
7 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit ccfaf866ba75a090b2c534b93e7e128eade2d741
Merge: 250024e3d603d12c20e465b821a9994399b10249
c7ff31884cfef39550905037ccf2579bfe8cda9d
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit 250024e3d603d12c20e465b821a9994399b10249
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

rpm - build fixes

commit 530e137676f01e5d48a03cd7fd076c386c467f68
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

itools-0.13.7

diff --git a/archive/rpm/BUILD b/archive/rpm/BUILD
index 9e2528e..ade4754 100755
--- a/archive/rpm/BUILD
+++ b/archive/rpm/BUILD
@@ -1,4 +1,5 @@
+WITH_DB_SUBDIR=/usr/lib &&
export LDFLAGS=${LDFLAGS/-z combreloc/} &&
-OPTS="$OPTS --disable-static $RPM_API $RPM_SELINUX
--with-libintl-prefix=/usr" &&
+OPTS="$OPTS $RPM_API $RPM_SELINUX --disable-static
--with-libintl-prefix=/usr" &&
#export CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python|
cut -c 1-3)" &&
default_build
diff --git a/archive/rpm/CONFIGURE b/archive/rpm/CONFIGURE
index c029cb7..2a4b806 100755
--- a/archive/rpm/CONFIGURE
+++ b/archive/rpm/CONFIGURE
@@ -1,2 +1,2 @@
config_query_option RPM_SELINUX "selinux support?" n "--with-selinux"
"--without-selinux"
-config_query_option RPM_API "build API docs?" n"--with-apidocs"
"--without-apidocs"
+config_query_option RPM_API "build API docs?" n "--with-apidocs"
"--without-apidocs"
diff --git a/archive/rpm/DEPENDS b/archive/rpm/DEPENDS
index c833e08..4e7396f 100755
--- a/archive/rpm/DEPENDS
+++ b/archive/rpm/DEPENDS
@@ -9,7 +9,7 @@ depends neon &&
depends file &&
depends gettext &&
depends beecrypt &&
-optional_depends gettext "NLS support" "--enable-nls"
"--disable-nls" &&
+optional_depends gettext "--enable-nls" "--disable-nls" "NLS support"
&&
optional_depends python "--with-python" "--without-python" "python
bindings" &&
optional_depends perl "--with-perl" "--without-perl" "perl
bindings" &&
optional_depends lua "--with-lua" "--without-lua" "lua support"

diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index 4bad051..02e67ad 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,5 +1,8 @@
2006-07-04 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: remove GCC_VERSION
+ * DEPENDS, CONFIGURE: fix typos
+ * PRE_BUILD: temporarily remove.
+ now builds included source packeages, will try again later to
prevent this

2006-06-29 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 4.4.6
diff --git a/archive/rpm/PRE_BUILD b/archive/rpm/PRE_BUILD
deleted file mode 100755
index 0c9c8c4..0000000
--- a/archive/rpm/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-# use system copies of these libraries
-rm -r popt sqlite zlib db db3 file intl lua &&
-sedit \
-"s/DB=1/DB=/;/AC_CONFIG_SUBDIRS/D;s/=db3/=/;/lua\//D;s/TEXT/TEXT(external)/;s|intl/Makefile||"
\
- configure.ac &&
-sedit "s/intl//;s/lua//" Makefile.am &&
-./autogen.sh --noconfigure &&
-autoreconf
diff --git a/python-devel/itools/DETAILS b/python-devel/itools/DETAILS
index 84a78c6..bbb2fb5 100755
--- a/python-devel/itools/DETAILS
+++ b/python-devel/itools/DETAILS
@@ -1,6 +1,6 @@
SPELL=itools
- VERSION=0.13.6
-
SOURCE_HASH=sha512:aed3bbc862406a7430901b815489a4d3e989345d1facde664ec75a27e09fb0f77f4281aa7f3578f02039e9ceb3b4b162d265211ec1aa58c7ded0473e52086f7d
+ VERSION=0.13.7
+
SOURCE_HASH=sha512:6fc823cb6f76085e3ead8c7c8c94b3a39dd783154cebcf322876dc3732f624751a579d9915243791a8e6f87b3215392f42b6a6b54fc96a51a563aba476245bc9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.ikaaro.org
diff --git a/python-devel/itools/HISTORY b/python-devel/itools/HISTORY
index 7039fa6..d44493c 100644
--- a/python-devel/itools/HISTORY
+++ b/python-devel/itools/HISTORY
@@ -1,3 +1,6 @@
+2006-07-04 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.13.7
+
2006-06-30 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.13.6




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ccfaf866ba75a090b2c534b93e7e128eade2d741), Treeve Jelbert, 07/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page