[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e2c9f72d71f94d6fb46e47b26bcdacf6216675a0)

Treeve Jelbert scm at sourcemage.org
Fri Apr 2 10:25:37 EDT 2010


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 crypto/gss/DETAILS           |    4 ++--
 crypto/gss/HISTORY           |    4 ++++
 gnome2-apps/gramps/BUILD     |    4 +---
 gnome2-apps/gramps/DEPENDS   |    3 ++-
 gnome2-apps/gramps/DETAILS   |    4 ++--
 gnome2-apps/gramps/HISTORY   |    6 ++++++
 gnome2-apps/gramps/PRE_BUILD |   10 ++++++++++
 7 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit e2c9f72d71f94d6fb46e47b26bcdacf6216675a0
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gramps - make it actually work by using bsddb3 instead of broken python db support

commit 1ed2edfb469d050b9a7b1fbb687c6c680daffe64
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gss: => 1.0.0

commit 8b7e90b1c0ca4face75ffceedfcba465ca6d01b2
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    gramps: => 3.2.0

diff --git a/crypto/gss/DETAILS b/crypto/gss/DETAILS
index a453695..641cd35 100755
--- a/crypto/gss/DETAILS
+++ b/crypto/gss/DETAILS
@@ -1,9 +1,9 @@
            SPELL=gss
-         VERSION=0.1.5
+         VERSION=1.0.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://alpha.gnu.org/gnu/gss/$SOURCE
+   SOURCE_URL[0]=$GNU_URL/gss/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=B565716F.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
diff --git a/crypto/gss/HISTORY b/crypto/gss/HISTORY
index 211a7c8..22839fd 100644
--- a/crypto/gss/HISTORY
+++ b/crypto/gss/HISTORY
@@ -1,3 +1,7 @@
+2010-04-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.0
+	  use GNU_URL
+
 2010-03-26 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.1.5
 
diff --git a/gnome2-apps/gramps/BUILD b/gnome2-apps/gramps/BUILD
index 5e9c466..00a0e19 100755
--- a/gnome2-apps/gramps/BUILD
+++ b/gnome2-apps/gramps/BUILD
@@ -1,4 +1,2 @@
-make_single    &&
 OPTS="$OPTS --disable-mime-install" &&
-default_build  &&
-make_normal
+default_build
diff --git a/gnome2-apps/gramps/DEPENDS b/gnome2-apps/gramps/DEPENDS
index c8a78a1..fd11af7 100755
--- a/gnome2-apps/gramps/DEPENDS
+++ b/gnome2-apps/gramps/DEPENDS
@@ -1,4 +1,5 @@
-depends  -sub db python      &&
+depends  python      &&
+depends  bsddb3      &&
 depends  -sub NUMPY pygtk2   &&
 depends  librsvg2            &&
 depends  xdg-utils           &&
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index 4ec39d2..ccaa151 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gramps
-         VERSION=3.1.3
-     SOURCE_HASH=sha512:22e4b5de2f8f1f13211d962183aca35fe19e5eb17cdf386cd0b8fdcef0f386dc29ff7705c8012badfe816cab5112dcbd0d35f6bfbf1374000bd4db0bed42c010
+         VERSION=3.2.0
+     SOURCE_HASH=sha512:490f8a2b2c40817e1f9837554cbfc3e6cfc510f93539b369e1c9318d5337f7a80b0fd1b1db918ce84e35e863ed2f0c018be809a3830b6baf0e3124a2a318dac6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 9cfa9d7..0e72226 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,9 @@
+2010-04-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS:  version 3.2.0
+	* PRE_BUILD: use bsddb3 instead of broken db support in python
+	* DEPENDS: add bsddb3
+	* BUILD: remove make_single
+
 2009-12-07 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS:  version 3.1.7
 
diff --git a/gnome2-apps/gramps/PRE_BUILD b/gnome2-apps/gramps/PRE_BUILD
new file mode 100755
index 0000000..f40f165
--- /dev/null
+++ b/gnome2-apps/gramps/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY &&
+# force use of bsddb3
+#  sed -i 's/from bsddb/&3/;s/import.*bsddb/&3/' $FF
+MOD=`grep -R  bsddb *|grep import|cut -d:  -f1` &&
+for FF in $MOD ;do
+  sed -i 's/bsddb/&3/g' $FF
+done &&
+#sed -i 's/bsddb/&3/' src/GrampsLogger/_ErrorReportAssistant.py &&
+sed -i 's/b3txn/btxn/' src/gen/db/__init__.py



More information about the SM-Commit mailing list