diff --git a/autogen.sh b/autogen.sh deleted file mode 100644 index df2e8f2..0000000 --- a/autogen.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -# -# NOTE: compare_versions() is stolen from gnome-autogen.sh - -REQUIRED_VALA_VERSION=0.18.0 - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Vala version check -test -z "$VALAC" && VALAC=valac -VALA_VERSION=`$VALAC --version | cut -d" " -f2` - -if [ -z "$VALA_VERSION" ]; then - echo "**Error**: valac not installed or broken. You must have valac >= $REQUIRED_VALA_VERSION" - echo "installed to build." - exit 1 -fi - -echo "Found Vala $VALA_VERSION" - -if ! compare_versions $REQUIRED_VALA_VERSION $VALA_VERSION; then - echo "**Error**: You must have valac >= $REQUIRED_VALA_VERSION installed to build, you have $VALA_VERSION" - exit 1 -fi - -# Generate required files -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. -( - cd "$srcdir" && - touch ChangeLog && # Automake requires that ChangeLog exist - gtkdocize --flavour no-tmpl && - autopoint --force && - AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install -) || exit -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/tracker-1.0.2.tar.xz b/tracker-1.0.2.tar.xz deleted file mode 100644 index 662aa38..0000000 --- a/tracker-1.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 -size 6046600 diff --git a/tracker-1.0.3.tar.xz b/tracker-1.0.3.tar.xz new file mode 100644 index 0000000..db4a86d --- /dev/null +++ b/tracker-1.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:508433e0c7101a844fc7ba589a8ebbcb4d5c7c3672d1868695f500f81a65f886 +size 6038148 diff --git a/tracker-extras.changes b/tracker-extras.changes index b587d49..95dff63 100644 --- a/tracker-extras.changes +++ b/tracker-extras.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri Aug 22 13:35:32 UTC 2014 - dimstar@opensuse.org + +- Update to version 1.0.3: + + Clean up License files. + + Buildsystem fixes. + + libtracker-fts: Make private functions static. + + libtracker-data: + - Fixed unit tests so files are not left around failing + distcheck. + - Fix tracker-backup unit test failures. + + libtracker-common: Enable G_MESSAGES_DEBUG for verbosity > 1, + not 2. + + libtracker-extract: + - Fixed TRACKER_EXTRACTORS_DIR env var. + - Remove from examples/ this library is now private. + + libtracker-miner: + - Chain parent constructed() in TrackerDecorator. + - Document TRACKER_MINER_DBUS_* defines. + - .pc Requires.priv libmediaart (if built with it). + + libtracker-control: + - Added .gitignore for VAPI and other generated content. + - Added missing sections.txt for documentation. + + tracker-extract: + - Added rule for source code files to add nfo:SourceCode + rdf-type. + - MP3 id3v23, id3v24 functions documented and v23 fixed. + - Use default signal handler for SIGALRM and SIGABRT. + + writeback: support saving metadata for GIFs. + + tests: Use tap automake testing scripts, fixes output + summaries. + + functional-tests: Rework 400-extractor.py test. + + Bugs fixed: bgo#734464, bgo#733573, bgo#733317, bgo#733857, + bgo#734089, bgo#734144, bgo#733316, bgo#733439, bgo#733317. + + Updated translations. +- Drop tracker-thunderbird.patch and tracker-missing-include.patch: + fixed upstream. +- Replace autogen.sh call with gnome-autogen.sh: tracker switched + to using the default in git as well. +- Drop autogen.sh as source: no longer required after the switch to + gnome-autogen.sh. + ------------------------------------------------------------------- Thu Jul 31 09:53:00 UTC 2014 - dimstar@opensuse.org diff --git a/tracker-extras.spec b/tracker-extras.spec index fa9d9ac..59d247f 100644 --- a/tracker-extras.spec +++ b/tracker-extras.spec @@ -45,7 +45,7 @@ # Do not edit this auto generated file! Edit tracker.spec. Name: tracker-extras %define _name tracker -Version: 1.0.2 +Version: 1.0.3 Release: 0 %define TrackerAPI 1.0 %define RPMTrackerAPI 1_0 @@ -55,14 +55,9 @@ Group: Productivity/Other Url: http://projects.gnome.org/tracker/ Source0: http://download.gnome.org/sources/tracker/1.0/%{_name}-%{version}.tar.xz # Needed for patch0: we need to bootstrap -Source1: autogen.sh Source2: README.SUSE.rss # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-extract-private.patch -# PATCH-FIX-UPSTREAM tracker-missing-include.patch dimstar@opensuse.org -- Add missing includes, taken from git -Patch1: tracker-missing-include.patch -# PATCH-FIX-UPSTREAM tracker-thunderbird.patch dimstar@opensuse.org -- Accept that tracker might have some stderr output as well (glib slice) -Patch2: tracker-thunderbird.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes @@ -482,19 +477,17 @@ This package contains an nautilus plugin to tag files with Tracker. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -cp %{S:1} . translation-update-upstream cp %{S:2} src/miners/rss/README.SUSE %build # Needed for patch0 -NOCONFIGURE=1 sh ./autogen.sh +NOCONFIGURE=1 gnome-autogen.sh %configure \ + --disable-static \ %if !%{build_extras} - --enable-libvorbis \ - --enable-libflac \ + --enable-libvorbis \ + --enable-libflac \ %endif %if %{build_evo} --enable-miner-evolution \ diff --git a/tracker-missing-include.patch b/tracker-missing-include.patch deleted file mode 100644 index f73dbef..0000000 --- a/tracker-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82245d1bae70e22d26187d584d2342036f1f43f3 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Fri, 11 Jul 2014 18:05:57 +0200 -Subject: [PATCH] libtracker-data: fix missing include - -Since we make use of 'tracker_utf8_truncate', we must include -libtracker-common/tracker-utils.h now. ---- - src/libtracker-data/tracker-data-update.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c -index 31f840f..ea0a6e8 100644 ---- a/src/libtracker-data/tracker-data-update.c -+++ b/src/libtracker-data/tracker-data-update.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - --- -1.9.2 - diff --git a/tracker-thunderbird.patch b/tracker-thunderbird.patch deleted file mode 100644 index 5039d97..0000000 --- a/tracker-thunderbird.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tracker-1.0.2/configure.ac -=================================================================== ---- tracker-1.0.2.orig/configure.ac -+++ tracker-1.0.2/configure.ac -@@ -427,7 +427,7 @@ have_tracker_miner_thunderbird="no " - - AC_PATH_PROG(THUNDERBIRD, thunderbird, thunderbird) - if test -n $THUNDERBIRD; then -- thunderbird_version=`$THUNDERBIRD --version | cut -d" " -f3` -+ thunderbird_version=`$THUNDERBIRD --version 2>/dev/null | awk '{print $NF}'` - - AX_COMPARE_VERSION([$thunderbird_version], ge, [$TRACKER_MINER_THUNDERBIRD_REQUIRED], - have_tracker_miner_thunderbird="yes", diff --git a/tracker.changes b/tracker.changes index b587d49..95dff63 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri Aug 22 13:35:32 UTC 2014 - dimstar@opensuse.org + +- Update to version 1.0.3: + + Clean up License files. + + Buildsystem fixes. + + libtracker-fts: Make private functions static. + + libtracker-data: + - Fixed unit tests so files are not left around failing + distcheck. + - Fix tracker-backup unit test failures. + + libtracker-common: Enable G_MESSAGES_DEBUG for verbosity > 1, + not 2. + + libtracker-extract: + - Fixed TRACKER_EXTRACTORS_DIR env var. + - Remove from examples/ this library is now private. + + libtracker-miner: + - Chain parent constructed() in TrackerDecorator. + - Document TRACKER_MINER_DBUS_* defines. + - .pc Requires.priv libmediaart (if built with it). + + libtracker-control: + - Added .gitignore for VAPI and other generated content. + - Added missing sections.txt for documentation. + + tracker-extract: + - Added rule for source code files to add nfo:SourceCode + rdf-type. + - MP3 id3v23, id3v24 functions documented and v23 fixed. + - Use default signal handler for SIGALRM and SIGABRT. + + writeback: support saving metadata for GIFs. + + tests: Use tap automake testing scripts, fixes output + summaries. + + functional-tests: Rework 400-extractor.py test. + + Bugs fixed: bgo#734464, bgo#733573, bgo#733317, bgo#733857, + bgo#734089, bgo#734144, bgo#733316, bgo#733439, bgo#733317. + + Updated translations. +- Drop tracker-thunderbird.patch and tracker-missing-include.patch: + fixed upstream. +- Replace autogen.sh call with gnome-autogen.sh: tracker switched + to using the default in git as well. +- Drop autogen.sh as source: no longer required after the switch to + gnome-autogen.sh. + ------------------------------------------------------------------- Thu Jul 31 09:53:00 UTC 2014 - dimstar@opensuse.org diff --git a/tracker.spec b/tracker.spec index 1faefa6..c9f79dd 100644 --- a/tracker.spec +++ b/tracker.spec @@ -44,7 +44,7 @@ Name: tracker %define _name tracker -Version: 1.0.2 +Version: 1.0.3 Release: 0 %define TrackerAPI 1.0 %define RPMTrackerAPI 1_0 @@ -54,14 +54,9 @@ Group: Productivity/Other Url: http://projects.gnome.org/tracker/ Source0: http://download.gnome.org/sources/tracker/1.0/%{_name}-%{version}.tar.xz # Needed for patch0: we need to bootstrap -Source1: autogen.sh Source2: README.SUSE.rss # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar@opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-extract-private.patch -# PATCH-FIX-UPSTREAM tracker-missing-include.patch dimstar@opensuse.org -- Add missing includes, taken from git -Patch1: tracker-missing-include.patch -# PATCH-FIX-UPSTREAM tracker-thunderbird.patch dimstar@opensuse.org -- Accept that tracker might have some stderr output as well (glib slice) -Patch2: tracker-thunderbird.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes @@ -481,19 +476,17 @@ This package contains an nautilus plugin to tag files with Tracker. %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -cp %{S:1} . translation-update-upstream cp %{S:2} src/miners/rss/README.SUSE %build # Needed for patch0 -NOCONFIGURE=1 sh ./autogen.sh +NOCONFIGURE=1 gnome-autogen.sh %configure \ + --disable-static \ %if !%{build_extras} - --enable-libvorbis \ - --enable-libflac \ + --enable-libvorbis \ + --enable-libflac \ %endif %if %{build_evo} --enable-miner-evolution \