Hello community, here is the log from the commit of package grilo-plugins for openSUSE:Factory checked in at 2012-01-26 14:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo-plugins (Old) and /work/SRC/openSUSE:Factory/.grilo-plugins.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grilo-plugins", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grilo-plugins/grilo-plugins.changes 2012-01-19 16:55:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grilo-plugins.new/grilo-plugins.changes 2012-01-26 14:04:37.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 19 09:31:21 UTC 2012 - vuntz@opensuse.org + +- Add support for tracker 0.13/0.14: + + Add grilo-plugins-tracker-0.14.patch. + + Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. + + Change pkgconfig(tracker-sparql-0.12) BuildRequires to + pkgconfig(tracker-sparql-0.14). + +------------------------------------------------------------------- New: ---- grilo-plugins-tracker-0.14.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo-plugins.spec ++++++ --- /var/tmp/diff_new_pack.PBFLq2/_old 2012-01-26 14:04:38.000000000 +0100 +++ /var/tmp/diff_new_pack.PBFLq2/_new 2012-01-26 14:04:38.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: grilo-plugins Version: 0.1.18 Release: 0 @@ -25,6 +24,10 @@ Group: Productivity/Multimedia/Other Url: https://live.gnome.org/Grilo Source: http://download.gnome.org/sources/grilo-plugins/0.1/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM grilo-plugins-tracker-0.14.patch bgo#667855 vuntz@opensuse.org -- Support tracker 0.13/0.14 +Patch0: grilo-plugins-tracker-0.14.patch +# needed for patch0 +BuildRequires: gnome-common BuildRequires: libgcrypt-devel # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz @@ -44,7 +47,7 @@ BuildRequires: pkgconfig(sqlite3) %if 0%{?suse_version} > 1140 BuildRequires: pkgconfig(libquvi) >= 0.2.15 -BuildRequires: pkgconfig(tracker-sparql-0.12) +BuildRequires: pkgconfig(tracker-sparql-0.14) %else BuildRequires: pkgconfig(tracker-sparql-0.10) %endif @@ -60,8 +63,11 @@ %prep %setup -q +%patch0 -p1 %build +# needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-static make %{?_smp_mflags} ++++++ grilo-plugins-tracker-0.14.patch ++++++ commit b3bd590af3fec82e97acb9890018313b0116efe9 Author: Vincent Untz <vuntz@gnome.org> Date: Thu Jan 19 10:30:28 2012 +0100 build: Support build against tracker 0.13/0.14 https://bugzilla.gnome.org/show_bug.cgi?id=667855 diff --git a/configure.ac b/configure.ac index 190313f..b4a438c 100644 --- a/configure.ac +++ b/configure.ac @@ -133,11 +133,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6, HAVE_GMIME=yes, HAVE_GMIME=no)]) -PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, +PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14, HAVE_TRACKER_SPARQL=yes, HAVE_TRACKER_SPARQL=no) if test "x$HAVE_TRACKER_SPARQL" = "xno"; then + PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) +fi + +if test "x$HAVE_TRACKER_SPARQL" = "xno"; then PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11, HAVE_TRACKER_SPARQL=yes, HAVE_TRACKER_SPARQL=no) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org