diff options
| author | Treeve Jelbert | 2007-07-01 16:32:59 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2007-07-01 16:32:59 +0200 |
| commit | 5b93c122728c6fbfa7db4f578fc5c9ecf1e0a2d5 (patch) | |
| tree | 80679e2d3ba9f67542288e89ae0354445c98c8a7 | |
| parent | ccfe21388e28a9957f25a9aa6bcdc6cade5b6a78 (diff) | |
| parent | 5ef71d7a651cb1aea159ac364fb783f53d644360 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
| -rwxr-xr-x | gnome2-libs/tracker/DETAILS | 13 | ||||
| -rw-r--r-- | gnome2-libs/tracker/HISTORY | 5 | ||||
| -rwxr-xr-x | gnome2-libs/tracker/PREPARE | 7 | ||||
| -rwxr-xr-x | gnome2-libs/tracker/PRE_BUILD | 4 | ||||
| -rwxr-xr-x | mail/thunderbird/DETAILS | 4 | ||||
| -rw-r--r-- | mail/thunderbird/HISTORY | 3 |
6 files changed, 33 insertions, 3 deletions
diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS index 3fdb081aaf..3d2cc8a991 100755 --- a/gnome2-libs/tracker/DETAILS +++ b/gnome2-libs/tracker/DETAILS @@ -1,9 +1,22 @@ SPELL=tracker +if [[ $TRACKER_SCM == y ]] ;then +if [[ $TRACKER_SCM_AUTO == y ]] ;then + VERSION=$(date +%Y%m%d) +else + VERSION=svn +fi + SOURCE=$SPELL-svn.tar.bz2 + SOURCE_IGNORE=volatile + SOURCE_URL=svn_http://svn.gnome.org/svn/tracker/trunk:tracker-svn +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn + FORCE_DOWNLOAD=1 +else VERSION=0.5.4 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://www.gnome.org/~jamiemcc/${SPELL}/${SOURCE} SOURCE_GPG="gurus.gpg:${SOURCE}.sig" +fi LICENSE[0]=GPL WEB_SITE=http://freedesktop.org/wiki/Software/Tracker ENTERED=20060524 diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY index 3d1207e066..21d930ae28 100644 --- a/gnome2-libs/tracker/HISTORY +++ b/gnome2-libs/tracker/HISTORY @@ -1,3 +1,8 @@ +2007-06-29 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * DETAILS: added svn option + * PREPARE: created, added svn option + * PRE_BUILD: added + 2007-03-11 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * CONFIGURE: added query for GUI * DEPENDS: move them around a bit, some are optional etc... diff --git a/gnome2-libs/tracker/PREPARE b/gnome2-libs/tracker/PREPARE new file mode 100755 index 0000000000..c1ba866308 --- /dev/null +++ b/gnome2-libs/tracker/PREPARE @@ -0,0 +1,7 @@ +config_query TRACKER_SCM "Do you want SCM version" n && +if [[ "${TRACKER_SCM}" == "y" ]] +then +config_query TRACKER_SCM_AUTO \ + "Automaticaly update the spell on sorcery queue/system-update?" \ + n +fi diff --git a/gnome2-libs/tracker/PRE_BUILD b/gnome2-libs/tracker/PRE_BUILD index 69b200e053..f38903063b 100755 --- a/gnome2-libs/tracker/PRE_BUILD +++ b/gnome2-libs/tracker/PRE_BUILD @@ -1,6 +1,8 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && - +if [[ $TRACKER_SCM == y ]] ; then +NOCONFIGURE=X ./autogen.sh +fi && patch -p0 < ${SCRIPT_DIRECTORY}/inotify-fix.diff && # Fix for dbus 0.9X diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS index 46fd55c389..aea2921002 100755 --- a/mail/thunderbird/DETAILS +++ b/mail/thunderbird/DETAILS @@ -7,8 +7,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2 if [ "$BUILD_ENIGMAIL" = "y" ]; then -ENIGMAIL_VERSION=0.95.1 - PATCHLEVEL=1 +ENIGMAIL_VERSION=0.95.2 + PATCHLEVEL=2 SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz SOURCE4=${SOURCE3}.sig SOURCE4_IGNORE=signature diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY index 1d1ee09ab8..67abd48e4b 100644 --- a/mail/thunderbird/HISTORY +++ b/mail/thunderbird/HISTORY @@ -1,3 +1,6 @@ +2007-07-01 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: ENIGMAIL_VERSION=0.95.2 + 2007-06-23 David Kowis <dkowis@shlrm.org> * visibility.patch, PRE_BUILD: removed visibility patch * DEPENDS: removed dependency on autoconf-2.13 |