[meego-packaging] [meego-commits] 10019: Changes to Trunk:Testing/tracker
Zhu, Peter J
peter.j.zhu at intel.com
Sat Nov 27 20:17:43 PST 2010
Could this fix the issue of BMC#9873?
Could you fix he long-standing issue of qtcontacts-tracker build failed? Shouldn't be rock science to fix that.
Peter
> -----Original Message-----
> From: meego-commits-bounces at meego.com
> [mailto:meego-commits-bounces at meego.com] On Behalf Of Jean-Luc
> Lamadon
> Sent: Saturday, November 27, 2010 6:22 PM
> To: meego-commits at meego.com
> Subject: [meego-commits] 10019: Changes to Trunk:Testing/tracker
>
> Hi,
> I have made the following changes to tracker in project Trunk:Testing. Please
> review and accept ASAP.
>
> Thank You,
> Jean-Luc Lamadon
>
> [This message was auto-generated]
>
> ---
>
> Request #10019:
>
> submit: devel:contentfw/tracker(r33) -> Trunk:Testing/tracker
>
>
> Message:
> * Sat Nov 27 2010 Jean-Luc Lamadon <jean-luc.lamadon at nokia.com>
> 0.9.26
> - Qtcontacts-tracker needs update (BMC#10290)
> - Added patches 0006 and 0007 to set configuration option --enable-maemo
>
> State: new 2010-11-27T02:21:38 lamadon
> Comment: None
>
>
>
> changes files:
> --------------
> --- tracker.changes
> +++ tracker.changes
> @@ -0,0 +1,4 @@
> +* Sat Nov 27 2010 Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> 0.9.26
> +- Qtcontacts-tracker needs update (BMC#10290)
> +- Added patches 0006 and 0007 to set configuration option --enable-maemo
> +
> @@ -7 +11 @@
> -- Since icu is upgrade to 4.5.2, the pc mechanism is changed, change
> +- Since icu is upgrade to 4.5.2, the pc mechanism is changed, change
> @@ -13 +17 @@
> -- Renamed the patches
> +- Renamed the patches
>
> new:
> ----
> 0006-tracker-0.9.26-create-tests-xml.patch
> 0007-tracker-0.9.26-create-tests-aegis.patch
>
> spec files:
> -----------
> --- tracker.spec
> +++ tracker.spec
> @@ -21,6 +21,8 @@
> Patch2: 0003-Bug155-workaround.patch
> Patch3: 0004-Fix-shebang-on-testscript.patch
> Patch4: 0005-Fix-shebang-on-functionaltests.patch
> +Patch5: 0006-tracker-0.9.26-create-tests-xml.patch
> +Patch6: 0007-tracker-0.9.26-create-tests-aegis.patch
> Requires: gst-plugins-base >= 0.10
> Requires: gst-plugins-good >= 0.10
> Requires: o3read
> @@ -142,6 +144,10 @@
> %patch3 -p1
> # 0005-Fix-shebang-on-functionaltests.patch
> %patch4 -p1
> +# 0006-tracker-0.9.26-create-tests-xml.patch
> +%patch5 -p1
> +# 0007-tracker-0.9.26-create-tests-aegis.patch
> +%patch6 -p1
> # >> setup
> # << setup
>
> @@ -180,9 +186,13 @@
> --disable-qt \
> --disable-gdkpixbuf \
> --disable-libwv2 \
> +--enable-maemo \
> --with-enca \
> --with-unicode-support=libicu
>
> +chmod +x tests/functional-tests/create-tests-xml.py
> +chmod +x tests/functional-tests/create-tests-aegis.py
> +
> make %{?_smp_mflags}
>
> # << build post
> @@ -198,8 +208,6 @@
> # << install post
> %find_lang %{name}
>
> -
> -
> %post
> /sbin/ldconfig
> /bin/touch --no-create %{_datadir}/icons/hicolor || :
> @@ -212,13 +220,6 @@
> %{_bindir}/gtk-update-icon-cache \
> --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
>
> -
> -
> -
> -
> -
> -
> -
> %files -f %{name}.lang
> %defattr(-,root,root,-)
> # >> files
> @@ -259,10 +260,10 @@
> %{_libdir}/pkgconfig/tracker-*.pc
> # << files devel
>
> -
> %files tests
> %defattr(-,root,root,-)
> # >> files tests
> +%exclude %{_datadir}/tracker-tests/tracker-tests.aegis
> %{_datadir}/tracker-tests/*
> # << files tests
>
>
> other changes:
> --------------
>
> ++++++ 0006-tracker-0.9.26-create-tests-xml.patch (new)
> --- 0006-tracker-0.9.26-create-tests-xml.patch
> +++ 0006-tracker-0.9.26-create-tests-xml.patch
> +--- tracker-0.9.26.orig/tests/functional-tests/create-tests-xml.py
> 1970-01-01 02:00:00.000000000 +0200
> ++++ tracker-0.9.26/tests/functional-tests/create-tests-xml.py 2010-11-26
> 00:28:55.000000000 +0200
> +@@ -0,0 +1,104 @@
> ++#!/usr/bin/python2.6
> ++import os
> ++import sys
> ++import inspect
> ++import imp
> ++
> ++from common.utils import configuration as cfg
> ++
> ++### This function comes from pydoc. Cool!
> ++def importfile(path):
> ++ """Import a Python source file or compiled file given its path."""
> ++ magic = imp.get_magic()
> ++ file = open(path, 'r')
> ++ if file.read(len(magic)) == magic:
> ++ kind = imp.PY_COMPILED
> ++ else:
> ++ kind = imp.PY_SOURCE
> ++ file.close()
> ++ filename = os.path.basename(path)
> ++ name, ext = os.path.splitext(filename)
> ++ file = open(path, 'r')
> ++ module = None
> ++ try:
> ++ module = imp.load_module(name, file, path, (ext, 'r', kind))
> ++ except Exception, e:
> ++ print >> sys.stderr, "Ignoring %s (%s)" % (path, e)
> ++ #raise Exception ()
> ++ file.close()
> ++ return module
> ++
> ++
> ++HEADER = """
> ++<testdefinition version="0.1">
> ++ <suite name="tracker">
> ++ <description>Functional tests for the brilliant tracker</description> """
> ++
> ++TEST_CASE_TMPL = """ <case name="%s">
> ++ <description>%s</description>
> ++ <step>%s</step>
> ++ </case>"""
> ++
> ++FOOTER = """
> ++ </suite>
> ++</testdefinition>"""
> ++
> ++PRE_STEPS = """ <pre_steps>
> ++ <step>pidof call-history|xargs kill -9</step>
> ++ <step>initctl stop xsession/relevanced</step>
> ++ <step>initctl stop xsession/tracker-miner</step>
> ++ <step>su - user -c "tracker-control -k"</step>
> ++ </pre_steps>
> ++"""
> ++
> ++def __get_doc (obj):
> ++ if obj.__doc__:
> ++ return obj.__doc__.strip ()
> ++ else:
> ++ return "FIXME description here"
> ++
> ++def print_as_xml (filename):
> ++
> ++ module = importfile (filename)
> ++ if not module:
> ++ return
> ++
> ++ print "\n <set name=\"%s\">" % (module.__name__)
> ++ print " <description>%s</description>" % (__get_doc
> (module))
> ++ print PRE_STEPS
> ++ for name, obj in inspect.getmembers (module):
> ++ if name.startswith ("Common") or name.endswith ("Template"):
> ++ continue
> ++
> ++ if (inspect.isclass (obj)
> ++ and obj.__module__ == filename[:-3]):
> ++ script = os.path.join (cfg.DATADIR, "tracker-tests", filename)
> ++ print TEST_CASE_TMPL % (name,
> ++ __get_doc (obj),
> ++ script + " " + name)
> ++
> ++ print """ <environments>
> ++ <scratchbox>true</scratchbox>
> ++ <hardware>true</hardware>
> ++ </environments>
> ++ </set>
> ++ """
> ++ # Remove the compiled .pyc from the disk (because it looks ugly)
> ++ #
> ++ # First time a module is loaded, __file__ is the .py
> ++ # once the file is compiled, __file__ is .pyc
> ++ if module.__file__.endswith (".py"):
> ++ unlink = module.__file__ + "c"
> ++ else:
> ++ unlink = module.__file__
> ++ os.unlink (unlink)
> ++
> ++
> ++if __name__ == "__main__":
> ++
> ++ if (len (sys.argv) < 2):
> ++ print >> sys.stderr, "pass .py tests as parameter"
> ++ sys.exit (-1)
> ++ print HEADER
> ++ map (print_as_xml, sys.argv[1:])
> ++ print FOOTER
>
> ++++++ 0007-tracker-0.9.26-create-tests-aegis.patch (new)
> --- 0007-tracker-0.9.26-create-tests-aegis.patch
> +++ 0007-tracker-0.9.26-create-tests-aegis.patch
> +--- tracker-0.9.26.orig/tests/functional-tests/create-tests-aegis.py
> 1970-01-01 02:00:00.000000000 +0200
> ++++ tracker-0.9.26/tests/functional-tests/create-tests-aegis.py
> 2010-11-27 00:20:03.000000000 +0200
> +@@ -0,0 +1,62 @@
> ++#!/usr/bin/python2.6
> ++import os
> ++import sys
> ++import inspect
> ++import imp
> ++
> ++from common.utils import configuration as cfg
> ++
> ++### This function comes from pydoc. Cool!
> ++def importfile(path):
> ++ """Import a Python source file or compiled file given its path."""
> ++ magic = imp.get_magic()
> ++ file = open(path, 'r')
> ++ if file.read(len(magic)) == magic:
> ++ kind = imp.PY_COMPILED
> ++ else:
> ++ kind = imp.PY_SOURCE
> ++ file.close()
> ++ filename = os.path.basename(path)
> ++ name, ext = os.path.splitext(filename)
> ++ file = open(path, 'r')
> ++ module = None
> ++ try:
> ++ module = imp.load_module(name, file, path, (ext, 'r', kind))
> ++ except Exception, e:
> ++ print >> sys.stderr, "Ignoring %s (%s)" % (path, e)
> ++ #raise Exception ()
> ++ file.close()
> ++ return module
> ++
> ++
> ++HEADER = """
> ++<aegis>"""
> ++
> ++FOOTER = """
> ++</aegis>"""
> ++
> ++def print_aegis_perm_request (filename):
> ++ module = importfile (filename)
> ++ if not module:
> ++ return
> ++
> ++ install_path = os.path.join (cfg.DATADIR, "tracker-tests", filename)
> ++
> ++ print "\n <request>"
> ++ print ' <credential name="TrackerReadAccess" />'
> ++ print ' <credential name="TrackerWriteAccess" />'
> ++ print ' <credential name="tracker::tracker-extract-access" />'
> ++ print ' <credential name="tracker::tracker-miner-fs-access" />'
> ++ print ' <credential name="GRP::metadata-users" />'
> ++ print ' <for path="%s" />' % (install_path)
> ++ print " </request>"
> ++
> ++
> ++if __name__ == "__main__":
> ++
> ++ if (len (sys.argv) < 2):
> ++ print >> sys.stderr, "pass .py tests as parameter"
> ++ sys.exit (-1)
> ++ print HEADER
> ++ map (print_aegis_perm_request, sys.argv[1:])
> ++ print FOOTER
>
> ++++++ tracker.yaml
> --- tracker.yaml
> +++ tracker.yaml
> @@ -4,29 +4,31 @@
> Release: 1
> Group: Applications/System
> License: GPLv2+
> -URL: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.9/
> +URL: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.9/
> Sources:
> -
> http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}.
> tar.bz2
> - tracker-rpmlintrc
> Patches:
> - - 0001-Tracker-0.7.23-desktop-files.patch
> - - 0002-Tracker-extract-Parse-the-video-filename-to-obtain-e.patch
> - - 0003-Bug155-workaround.patch
> - - 0004-Fix-shebang-on-testscript.patch
> + - 0001-Tracker-0.7.23-desktop-files.patch
> + - 0002-Tracker-extract-Parse-the-video-filename-to-obtain-e.patch
> + - 0003-Bug155-workaround.patch
> + - 0004-Fix-shebang-on-testscript.patch
> - 0005-Fix-shebang-on-functionaltests.patch
> + - 0006-tracker-0.9.26-create-tests-xml.patch
> + - 0007-tracker-0.9.26-create-tests-aegis.patch
> Description: |
> Tracker is a powerful desktop-neutral first class object database,
> - tag/metadata database, search tool and indexer.
> -
> + tag/metadata database, search tool and indexer.
> +
> It consists of a common object database that allows entities to have an
> almost infinte number of properties, metadata (both
> embedded/harvested as
> well as user definable), a comprehensive database of keywords/tags and
> links to other entities.
> -
> +
> It provides additional features for file based objects including context
> linking and audit trails for a file object.
> -
> - It has the ability to index, store, harvest metadata. retrieve and search
> +
> + It has the ability to index, store, harvest metadata. retrieve and search
> all types of files and other first class objects
>
> Requires:
> @@ -75,7 +77,7 @@
> - poppler-glib
> - sqlite3
> - taglib
> - - totem-plparser
> + - totem-plparser
> - uuid
> - vala-1.0
> - vorbis
> @@ -83,7 +85,7 @@
> Builder: none
> LocaleName: "%{name}"
> AutoSubPackages:
> -- devel
> +- devel
> SubPackages:
> - Name: tests
> Summary: Tests for tracker
> @@ -96,15 +98,15 @@
> - pygobject2
> - python >= 2.6
>
> - - Name: utils
> - Summary: Tracker command line applications to lookup data
> + - Name: utils
> + Summary: Tracker command line applications to lookup data
> Group: Development/Tools
> - Description: |
> + Description: |
> Tracker command line applications to lookup data
> Included utilities for Tracker are as follows
> tracker-import Import TTL files.
> tracker-info Display all information known about an
> entity.
> - tracker-search Search for entites (files, folders, videos,
> etc)
> + tracker-search Search for entites (files, folders, videos,
> etc)
> tracker-sparql Run a SPARQL query against the
> databases.
> tracker-stats Get statistics on how many entities are
> indexed.
> tracker-status Get the current state of the miners.
>
> _______________________________________________
> MeeGo-commits mailing list
> MeeGo-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits
More information about the MeeGo-packaging
mailing list