diff options
| -rwxr-xr-x | libs/talloc/BUILD | 6 | ||||
| -rw-r--r-- | libs/talloc/C30A4429.gpg | bin | 0 -> 18104 bytes | |||
| -rwxr-xr-x | libs/talloc/DETAILS | 18 | ||||
| -rw-r--r-- | libs/talloc/HISTORY | 7 | ||||
| -rwxr-xr-x | libs/talloc/INSTALL | 6 | ||||
| -rwxr-xr-x | libs/talloc/PREPARE | 7 | ||||
| -rwxr-xr-x | libs/talloc/PRE_BUILD | 6 |
7 files changed, 43 insertions, 7 deletions
diff --git a/libs/talloc/BUILD b/libs/talloc/BUILD index f4182d2706..490cbc65fa 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 Binary files differnew file mode 100644 index 0000000000..17532f5bed --- /dev/null +++ b/libs/talloc/C30A4429.gpg diff --git a/libs/talloc/DETAILS b/libs/talloc/DETAILS index 67090b5124..359d79e06a 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 fec7ee4336..a3c97ca822 100644 --- a/libs/talloc/HISTORY +++ b/libs/talloc/HISTORY @@ -1,3 +1,10 @@ +2010-10-07 Bor Kraljič <pyrobor@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@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 e85c9fdeb7..918c90c8cc 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 8589e68fc6..0a7f54c600 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 2f136b3fce..630286c38d 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 |