[SM-Commit] GIT changes to master grimoire by Bor Kraljič (5448864c496682026b97f1a6e0d4a6c1f402a066)

Bor Kraljič scm at sourcemage.org
Sun Oct 10 10:50:02 EDT 2010


GIT changes to master grimoire by Bor Kraljič <pyrobor at ver.si>:

 libs/talloc/BUILD        |    6 +++++-
 libs/talloc/C30A4429.gpg |binary
 libs/talloc/DETAILS      |   18 +++++++++++++++---
 libs/talloc/HISTORY      |    7 +++++++
 libs/talloc/INSTALL      |    6 +++++-
 libs/talloc/PREPARE      |    7 ++++++-
 libs/talloc/PRE_BUILD    |    6 +++++-
 7 files changed, 43 insertions(+), 7 deletions(-)

New commits:
commit 3de6c8e29173bb61d454cd61420b07ddb271bba6
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    talloc: added versioned source from  http://samba.org/ftp/talloc/

diff --git a/libs/talloc/BUILD b/libs/talloc/BUILD
index f4182d2..490cbc6 100755
--- a/libs/talloc/BUILD
+++ b/libs/talloc/BUILD
@@ -1,2 +1,6 @@
-cd  $SOURCE_DIRECTORY/lib/$SPELL  &&
+cd  $SOURCE_DIRECTORY &&
+if [[ "$TALLOC_SCM" == "y" ]]
+then
+  cd lib/$SPELL
+fi &&
 default_build
diff --git a/libs/talloc/C30A4429.gpg b/libs/talloc/C30A4429.gpg
new file mode 100644
index 0000000..17532f5
Binary files /dev/null and b/libs/talloc/C30A4429.gpg differ
diff --git a/libs/talloc/DETAILS b/libs/talloc/DETAILS
index 67090b5..359d79e 100755
--- a/libs/talloc/DETAILS
+++ b/libs/talloc/DETAILS
@@ -1,13 +1,25 @@
            SPELL=talloc
-if [[ "$TALLOC_SCM_AUTOUPDATE"  ==  "y"  ]];  then
+if [[ $TALLOC_SCM == y ]]
+then
+  if [[ "$TALLOC_SCM_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
-else
+  else
          VERSION=git
-fi
+  fi
           SOURCE=samba4-git.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/samba4-git
    SOURCE_URL[0]=git://git.samba.org/samba.git:samba4
    SOURCE_IGNORE=volatile
+else
+         VERSION=2.0.1
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=http://samba.org/ftp/talloc/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=C30A4429.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+fi
       LICENSE[0]=GPL
         WEB_SITE=http://talloc.samba.org/
         KEYWORDS="memory library"
diff --git a/libs/talloc/HISTORY b/libs/talloc/HISTORY
index fec7ee4..a3c97ca 100644
--- a/libs/talloc/HISTORY
+++ b/libs/talloc/HISTORY
@@ -1,3 +1,10 @@
+2010-10-07 Bor Kraljič <pyrobor at ver.si>
+	* C30A4429.gpg: added gpg keyring
+	* INSTALL, BUILD, PRE_BUILD: source is at diffrent place if we don't have
+	  whole samba4 git source
+	* PREPARE: added query about SCM or versioned source
+	* DETAILS: added versioned source from http://samba.org/ftp/talloc/
+
 2009-04-17 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Share git checkout with samba4 to save bandwidth and disk space
 
diff --git a/libs/talloc/INSTALL b/libs/talloc/INSTALL
index e85c9fd..918c90c 100755
--- a/libs/talloc/INSTALL
+++ b/libs/talloc/INSTALL
@@ -1,2 +1,6 @@
-cd  $SOURCE_DIRECTORY/lib/$SPELL  &&
+cd  $SOURCE_DIRECTORY &&
+if [[ "$TALLOC_SCM" == "y" ]]
+then
+  cd lib/$SPELL
+fi &&
 default_install
diff --git a/libs/talloc/PREPARE b/libs/talloc/PREPARE
index 8589e68..0a7f54c 100755
--- a/libs/talloc/PREPARE
+++ b/libs/talloc/PREPARE
@@ -1 +1,6 @@
-config_query  TALLOC_SCM_AUTOUPDATE  "Automatically add to queue every day?"  n
+config_query TALLOC_SCM "Build the git version?" n
+
+if [[ "$TALLOC_SCM" == "y" ]]
+then
+  config_query  TALLOC_SCM_AUTOUPDATE "Automatically add to queue every day?" n
+fi
diff --git a/libs/talloc/PRE_BUILD b/libs/talloc/PRE_BUILD
index 2f136b3..630286c 100755
--- a/libs/talloc/PRE_BUILD
+++ b/libs/talloc/PRE_BUILD
@@ -1,3 +1,7 @@
 default_pre_build                 &&
-cd  $SOURCE_DIRECTORY/lib/$SPELL  &&
+cd  $SOURCE_DIRECTORY &&
+if [[ "$TALLOC_SCM" == "y" ]]
+then
+  cd lib/$SPELL
+fi &&
 NOCONFIGURE="on"  ./autogen.sh



More information about the SM-Commit mailing list