Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f5cb36c8491893809086e6d2dff511c1d851143c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f5cb36c8491893809086e6d2dff511c1d851143c)
  • Date: Sat, 8 Jul 2006 16:44:43 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

doc/sgml-common/HISTORY | 4 ++++
doc/sgml-common/PRE_REMOVE | 1 +
smgl/guru-tools/HISTORY | 4 ++++
smgl/guru-tools/INSTALL | 5 ++++-
smgl/guru-tools/PRE_BUILD | 3 +++
smgl/guru-tools/update_spell.summon.patch | 11 +++++++++++
6 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit f5cb36c8491893809086e6d2dff511c1d851143c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

guru-tools: update_spell.summon.patch, PRE_BUILD: added to fix ancient
#7287
fix INSTALL for stage root sorcery

commit a8be9cca0cea7597b6f11b5226fc56ebcd276935
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

sgml-common: ugly fix for PRE_REMOVE

diff --git a/doc/sgml-common/HISTORY b/doc/sgml-common/HISTORY
index 820e957..7386a72 100644
--- a/doc/sgml-common/HISTORY
+++ b/doc/sgml-common/HISTORY
@@ -1,3 +1,7 @@
+2006-07-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_REMOVE: appended true, so dispel always succeeds. Couldn't make
sense
+ of those files, so if anyone has a better solution ...
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/doc/sgml-common/PRE_REMOVE b/doc/sgml-common/PRE_REMOVE
index 6b3d17e..1317d48 100755
--- a/doc/sgml-common/PRE_REMOVE
+++ b/doc/sgml-common/PRE_REMOVE
@@ -2,3 +2,4 @@ if [ -e "/usr/bin/install-catalog" ]; th
install-catalog --remove /etc/sgml/sgml-ent.cat
/usr/share/sgml/sgml-iso-entities-8879.1986/catalog &&
install-catalog --remove /etc/sgml/sgml-docbook.cat /etc/sgml/sgml-ent.cat
fi
+true
diff --git a/smgl/guru-tools/HISTORY b/smgl/guru-tools/HISTORY
index 4bb7ec1..d52bda9 100644
--- a/smgl/guru-tools/HISTORY
+++ b/smgl/guru-tools/HISTORY
@@ -1,3 +1,7 @@
+2006-07-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * update_spell.summon.patch, PRE_BUILD: added to fix ancient #7287
+ * INSTALL: make it work with stage root sorcery
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/smgl/guru-tools/INSTALL b/smgl/guru-tools/INSTALL
index 39be007..c43a42e 100755
--- a/smgl/guru-tools/INSTALL
+++ b/smgl/guru-tools/INSTALL
@@ -2,7 +2,10 @@ rm -rf $SOURCE_DIRECTORY/old.libraries |
#prepare install likes to leave $SCRIPT_DIRECTORY/old.libraries around
#this breaks the cp line below
chmod 755 $SOURCE_DIRECTORY/* &&
-cp $SOURCE_DIRECTORY/* /usr/sbin &&
+# omit the old.binaries dir
+for file in $SOURCE_DIRECTORY/*; do
+ [[ -f $file ]] && cp $file /usr/sbin
+done &&
if [ ! -f /etc/sorcery/local/guruinfo ]; then
echo "GURU_NAME=\"Guru Name\"" >> /etc/sorcery/local/guruinfo
echo "GURU_EMAIL=\"$SORCERER\"" >> /etc/sorcery/local/guruinfo
diff --git a/smgl/guru-tools/PRE_BUILD b/smgl/guru-tools/PRE_BUILD
new file mode 100755
index 0000000..68dfc52
--- /dev/null
+++ b/smgl/guru-tools/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/update_spell.summon.patch
diff --git a/smgl/guru-tools/update_spell.summon.patch
b/smgl/guru-tools/update_spell.summon.patch
new file mode 100644
index 0000000..9bd652d
--- /dev/null
+++ b/smgl/guru-tools/update_spell.summon.patch
@@ -0,0 +1,11 @@
+--- update_spell.orig 2004-08-28 10:27:46.104017144 -0500
++++ update_spell 2004-08-28 10:28:05.439077768 -0500
+@@ -161,7 +161,7 @@
+ echo "# $SCRIPT: $SOURCE_CACHE: Write access refused, cancelled
downloading $SOURCE" 1>&2
+ else
+ rm "$PROBE"
+- dl_source "$SOURCE" "$URL" >/dev/null 2>&1
++ summon "$SPELL" >/dev/null 2>&1
+ fi
+ fi
+



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (f5cb36c8491893809086e6d2dff511c1d851143c), Jaka Kranjc, 07/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page