[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (030d646212ea087ed9d264414c273a9e2dce81a1)

Vasil Yonkov scm at sourcemage.org
Thu Apr 15 12:33:10 EDT 2010


GIT changes to master grimoire by Vasil Yonkov <spirtbrat at sourcemage.org>:

 dev/null                                       |binary
 gnome2-libs/tracker/BUILD                      |   16 ++
 gnome2-libs/tracker/CONFIGURE                  |   27 +++-
 gnome2-libs/tracker/DEPENDS                    |  160 +++++++++++++++++++------
 gnome2-libs/tracker/DETAILS                    |   20 ---
 gnome2-libs/tracker/HISTORY                    |   14 ++
 gnome2-libs/tracker/PREPARE                    |    8 -
 gnome2-libs/tracker/PRE_BUILD                  |    5 
 gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig |    0 
 gnome2-libs/tracker/tracker-0.8.1.tar.bz2.sig  |binary
 gnome2-libs/tracker/tracker-0.9.0.tar.bz2.sig  |binary
 11 files changed, 182 insertions(+), 68 deletions(-)

New commits:
commit 030d646212ea087ed9d264414c273a9e2dce81a1
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    tracker: removed SCM version, added developement version,
             updated developement to 0.9.0
             updated stable to 0.8.1
             removed TRACKER_MONITOR, TRACKER_GUI, added TRACKER_AC,
             TRACKER_SEARCH_TOOL, TRACKER_PREFERENCES, TRACKER_STATUS,
             TRACKER_EXPLORER, TRACKER_SEARCH_BAR,
             removed dependency on libgee, bzip2, gmime,
             removed optional dependency on gnome-vfs2, gnome-desktop,
             optionaly depends on id3lib, libxml2, libnotify, libgnome-keyring,
             gtk-doc, graphviz, enca, libvorbis, flac, totem-pl-parser,
             nautilus2, jpeg, tiff, libiptcdata, devicekit-power, hal, gtk+2,
             libgee, gnome-panel,
             removed PRE_BUILD

diff --git a/gnome2-libs/tracker/BUILD b/gnome2-libs/tracker/BUILD
index 0670a04..4c4ba12 100755
--- a/gnome2-libs/tracker/BUILD
+++ b/gnome2-libs/tracker/BUILD
@@ -1,5 +1,17 @@
-OPTS="--enable-video-extractor=${TRACKER_EXTRACTOR} ${OPTS}"  &&
-OPTS="--enable-file-monitoring=${TRACKER_MONITOR} ${OPTS}"    &&
+if [[ "${TRACKER_AC}" == "devicekit-power" ]]; then
+  OPTS="--enable-devkit-power --disable-hal ${OPTS}"
+else
+  OPTS="--disable-devkit-power --enable-hal ${OPTS}"
+fi &&
+
+OPTS="--enable-video-extractor=${TRACKER_EXTRACTOR} \
+      ${TRACKER_SEARCH_TOOL}                        \
+      ${TRACKER_PREFERENCES}                        \
+      ${TRACKER_STATUS}                             \
+      ${TRACKER_EXPLORER}                           \
+      ${TRACKER_SEARCH_BAR}                         \
+      ${OPTS}"                                      &&
+
 make_single    &&
 default_build  &&
 make_normal
diff --git a/gnome2-libs/tracker/CONFIGURE b/gnome2-libs/tracker/CONFIGURE
index 55c0d9c..62b6783 100755
--- a/gnome2-libs/tracker/CONFIGURE
+++ b/gnome2-libs/tracker/CONFIGURE
@@ -7,8 +7,27 @@ elif spell_ok xine-lib; then
 else
    config_query_list TRACKER_EXTRACTOR "Which video extractor to use?" \
                                        external gstreamer xine
-fi  &&
+fi &&
 
-config_query_list TRACKER_MONITOR "Which file monitoring to use?"      \
-                                   inotify fam polling                 &&
-config_query TRACKER_GUI "Do you want to build the GUI(adds gnome as dependency)" y
+config_query_list TRACKER_AC "Which AC power detection to use?" \
+                  devicekit-power hal                           &&
+
+config_query_option TRACKER_SEARCH_TOOL "Build tracker-search-tool?" y \
+                    "--enable-tracker-search-tool"                     \
+                    "--disable-tracker-search-tool"                    &&
+
+config_query_option TRACKER_PREFERENCES "Build tracker-preferences?" y \
+                    "--enable-tracker-preferences"                     \
+                    "--disable-tracker-preferences"                    &&
+
+config_query_option TRACKER_STATUS "Build tracker-status-icon?" y      \
+                    "--enable-tracker-status-icon"                     \
+                    "--disable-tracker-status-icon"                    &&
+
+config_query_option TRACKER_EXPLORER "Build tracker-explorer?" y       \
+                    "--enable-tracker-explorer"                        \
+                    "--disable-tracker-explorer"                       &&
+
+config_query_option TRACKER_SEARCH_BAR "Build tracker-search-bar?" y   \
+                    "--enable-tracker-search-bar"                      \
+                    "--disable-tracker-search-bar"
diff --git a/gnome2-libs/tracker/DEPENDS b/gnome2-libs/tracker/DEPENDS
index da48b22..17e4092 100755
--- a/gnome2-libs/tracker/DEPENDS
+++ b/gnome2-libs/tracker/DEPENDS
@@ -1,41 +1,129 @@
-depends libgee                                 &&
-depends dbus-glib                              &&
-depends bzip2                                  &&
-depends zlib                                   &&
-depends libpng                                 &&
-depends intltool                               &&
-depends perl                                   &&
-depends xml-parser-expat                       &&
-depends pango                                  &&
-depends gmime                                  &&
-depends sqlite  "--enable-external-sqlite"     &&
-optional_depends libgsf                        \
-                 "--enable-gsf"                \
-                 "--disable-gsf"               \
-                 "GSF data extractor"          &&
-optional_depends libexif                       \
-                 "--enable-exif"               \
-                 "--disable-exif"              \
-                 "exif data extractor"         &&
-optional_depends poppler                       \
-                 "--enable-pdf"                \
-                 "--disable-pdf"               \
-                 "PDF data extractor support"  &&
-
-if [[ ${TRACKER_GUI} == y ]]; then
-depends gtk+2  &&
-depends gnome-vfs2 &&
-depends gnome-desktop  &&
-optional_depends  xdg-utils  ""  ""  "for automatic adaption of programs used by tracker-search-tool to the desktop environment"
-fi &&
+depends dbus             &&
+depends dbus-glib        &&
+depends zlib             &&
+depends libpng           &&
+depends intltool         &&
+depends perl             &&
+depends xml-parser-expat &&
+depends pango            &&
+depends sqlite           &&
+depends data-uuid        &&
+depends glib2            &&
+
+optional_depends id3lib                                        \
+                 "--enable-id3lib"                             \
+                 "--disable-id3lib"                            \
+                 "for writeback for MP3 data"                  &&
+
+optional_depends libxml2                                       \
+                 "--enable-libxml2"                            \
+                 "--disable-libxml2"                           \
+                 "for HTML/XML extractors"                     &&
+
+optional_depends libnotify                                     \
+                 "--enable-libinotify"                         \
+                 "--disable-libinotify"                        \
+                 "for the filesystem monitoring"               &&
+
+optional_depends libgnome-keyring                              \
+                 "--enable-gnome-keyring"                      \
+                 "--disable-gnome-keyring"                     \
+                 "for Gnome Keyring support"                   &&
+
+optional_depends libgsf                                        \
+                 "--enable-libgsf"                             \
+                 "--disable-libgsf"                            \
+                 "GSF data extractor"                          &&
+
+optional_depends libexif                                       \
+                 "--enable-libexif"                            \
+                 "--disable-libexif"                           \
+                 "exif data extractor"                         &&
+
+optional_depends poppler                                       \
+                 "--enable-poppler-glib"                       \
+                 "--disable-poppler-glib"                      \
+                 "PDF data extractor support"                  &&
+
+optional_depends gtk-doc                                       \
+                 "--enable-gtk-doc"                            \
+                 "--disable-gtk-doc"                           \
+                 "to build documentation"                      &&
+
+if is_depends_enabled $SPELL gtk-doc; then
+  depends graphviz
+fi                                                             &&
+
+optional_depends enca                                          \
+                 "--with-enca"                                 \
+                 "--without-enca"                              \
+                 "for Cyrillic language detection in MP3s"     &&
+
+optional_depends libvorbis                                     \
+                 "--enable-libvorbis"                          \
+                 "--disable-libvorbis"                         \
+                 "for vorbis data (ogg) extractor"             &&
+
+optional_depends flac                                          \
+                 "--enable-libflac"                            \
+                 "--disable-libflac"                           \
+                 "for flac data extractor"                     &&
+
+optional_depends totem-pl-parser                               \
+                 "--enable-playlist"                           \
+                 "--disable-playlist"                          \
+                 "to enable playlist support"                  &&
+
+optional_depends nautilus2                                     \
+                 "--enable-nautilus-extension"                 \
+                 "--disable-nautilus-extension"                \
+                 "for the nautilus extension (tagging widget)" &&
+
+#optional_depends exempi                                        \
+#                 "--enable-exempi"                             \
+#                 "--disable-exempi"                            \
+#                 "for XMP data extractor"                      &&
+
+optional_depends jpeg                                          \
+                 "--enable-libjpeg"                            \
+                 "--disable-libjpeg"                           \
+                 "for JPEG data extractor"                     &&
+
+optional_depends tiff                                          \
+                 "--enable-libtiff"                            \
+                 "--disable-libtiff"                           \
+                 "for TIFF data extractor"                     &&
+
+optional_depends libiptcdata                                   \
+                 "--enable-libiptcdata"                        \
+                 "--disable-libiptcdata"                       \
+                 "for iptc data extractor"                     &&
 
 if [[ "${TRACKER_EXTRACTOR}" == "gstreamer" ]]; then
-depends gstreamer
+  depends gstreamer
 elif [[ "${TRACKER_EXTRACTOR}" == "xine" ]]; then
-depends xine-lib
-fi &&
+  depends xine-lib
+fi                                                             &&
+
+if [[ "${TRACKER_AC}" == "devicekit-power" ]]; then
+  depends devicekit-power
+else
+  depends hal
+fi                                                             &&
+
+if [[ "${TRACKER_SEARCH_TOOL}" == "--enable-tracker-search-tool" ]] ||
+   [[ "${TRACKER_PREFERENCES}" == "--enable-tracker-preferences" ]] ||
+   [[ "${TRACKER_STATUS}" == "--enable-tracker-status-icon" ]] ||
+   [[ "${TRACKER_EXPLORER}" == "--enable-tracker-explorer" ]] ||
+   [[ "${TRACKER_SEARCH_BAR}" == "--enable-tracker-search-bar" ]]; then
+  depends gtk+2
+fi                                                             &&
+
+if [[ "${TRACKER_SEARCH_TOOL}" == "--enable-tracker-search-tool" ]] ||
+   [[ "${TRACKER_EXPLORER}" == "--enable-tracker-explorer" ]]; then
+  depends libgee
+fi                                                             &&
 
-if [[ "${TRACKER_MONITOR}" == "fam" ]]; then
-depends FAM
+if [[ "${TRACKER_SEARCH_BAR}" == "--enable-tracker-search-bar" ]]; then
+  depends gnome-panel
 fi
-                 
diff --git a/gnome2-libs/tracker/DETAILS b/gnome2-libs/tracker/DETAILS
index 8abb3c9..70bbdb8 100755
--- a/gnome2-libs/tracker/DETAILS
+++ b/gnome2-libs/tracker/DETAILS
@@ -1,22 +1,14 @@
            SPELL=tracker
-if [[ $TRACKER_SCM == y ]] ;then
-if [[ $TRACKER_SCM_AUTO == y ]] ;then
-         VERSION=0.7.28
+if [[ "$TRACKER_DEVEL" == "y" ]]; then
+         VERSION=0.9.0
 else
-         VERSION=0.7.28
+         VERSION=0.8.1
 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.7.28
+          BRANCH=${VERSION:0:3}
           SOURCE=$SPELL-$VERSION.tar.bz2
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/${SPELL}/0.7/${SOURCE}
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-fi
+   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       LICENSE[0]=GPL
         WEB_SITE=http://www.tracker-project.org/
          ENTERED=20060524
diff --git a/gnome2-libs/tracker/HISTORY b/gnome2-libs/tracker/HISTORY
index d08b8a6..458fd91 100644
--- a/gnome2-libs/tracker/HISTORY
+++ b/gnome2-libs/tracker/HISTORY
@@ -1,3 +1,17 @@
+2010-04-15 Vasil Yonkov <spirtbrat at sourcemage.org>
+	* BUILD, CONFIGURE: removed TRACKER_MONITOR, TRACKER_GUI,
+	  added TRACKER_AC, TRACKER_SEARCH_TOOL, TRACKER_PREFERENCES,
+	  TRACKER_STATUS, TRACKER_EXPLORER, TRACKER_SEARCH_BAR
+	* DEPENDS: removed libgee, bzip2, gmime, removed optional gnome-vfs2,
+	  xdg-utils, gnome-desktop, added optional id3lib, libxml2, libnotify,
+	  libgnome-keyring, gtk-doc, graphviz, enca, libvorbis, flac,
+	  totem-pl-parser, nautilus2, jpeg, tiff, libiptcdata, devicekit-power,
+	  hal, gtk+2, libgee, gnome-panel
+	* DETAILS, PREPARE: removed SCM version, added developement version
+	  updated developement to 0.9.0
+	  updated stable to 0.8.1
+	* PRE_BUILD: removed
+
 2010-03-30 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 0.7.28
 
diff --git a/gnome2-libs/tracker/PREPARE b/gnome2-libs/tracker/PREPARE
index c1ba866..c4b2a76 100755
--- a/gnome2-libs/tracker/PREPARE
+++ b/gnome2-libs/tracker/PREPARE
@@ -1,7 +1 @@
-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
+config_query TRACKER_DEVEL "Build devel version?" n
diff --git a/gnome2-libs/tracker/PRE_BUILD b/gnome2-libs/tracker/PRE_BUILD
deleted file mode 100755
index 9d9091f..0000000
--- a/gnome2-libs/tracker/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build                                 &&
-cd ${SOURCE_DIRECTORY}                            &&
-if [[ $TRACKER_SCM == y ]] ; then
-NOCONFIGURE=X ./autogen.sh
-fi
diff --git a/gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig b/gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig
deleted file mode 100644
index 3530e8a..0000000
Binary files a/gnome2-libs/tracker/tracker-0.7.28.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/tracker/tracker-0.8.1.tar.bz2.sig b/gnome2-libs/tracker/tracker-0.8.1.tar.bz2.sig
new file mode 100644
index 0000000..4f9652b
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.8.1.tar.bz2.sig differ
diff --git a/gnome2-libs/tracker/tracker-0.9.0.tar.bz2.sig b/gnome2-libs/tracker/tracker-0.9.0.tar.bz2.sig
new file mode 100644
index 0000000..71f51ed
Binary files /dev/null and b/gnome2-libs/tracker/tracker-0.9.0.tar.bz2.sig differ



More information about the SM-Commit mailing list