From 5ba2da639a6d33a394f273610fa66208ce588f45 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Wed, 27 Mar 2013 23:58:21 +0100 Subject: [PATCH] Update to 3.8.0 - added patch to add support for tracker 1.16 --- brasero-tracker016.patch | 54 ++++++++++++++++++++++++++++++++++++++++ brasero.spec | 10 +++++--- 2 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 brasero-tracker016.patch diff --git a/brasero-tracker016.patch b/brasero-tracker016.patch new file mode 100644 index 0000000..1d861d7 --- /dev/null +++ b/brasero-tracker016.patch @@ -0,0 +1,54 @@ +From f3a73618755d39ae21a9ee1dc96ba43158fc0cac Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sun, 27 Jan 2013 23:25:54 +0100 +Subject: [PATCH] build: Simplify tracker version searching and support 0.16 + API + +Use an iterator instead of a deep dependency tree. This should simplify +adding support for new tracker versions in the future. + +https://bugzilla.gnome.org/show_bug.cgi?id=692664 +--- + configure.ac | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 016c873..9f0b4af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -382,21 +382,22 @@ AC_ARG_ENABLE(search, + esac], + [enable_search="auto"]) + ++if test x"$enable_search" != "xno"; then ++ # Try to figure out the tracker API version to use ++ tracker_api="0.10" ++ m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16]], ++ [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED], ++ [tracker_api="VERSION"]) ++ ]) ++fi ++ + if test x"$enable_search" = "xauto"; then +- PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED], +- [enable_search=yes], +- [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED], +- [enable_search=yes], +- [PKG_CHECK_EXISTS([tracker-sparql-0.10 >= $TRACKER_REQUIRED], +- [enable_search=yes], +- [enable_search=no])])]) ++ PKG_CHECK_EXISTS([tracker-sparql-$tracker_api >= $TRACKER_REQUIRED], ++ [enable_search=yes], ++ [enable_search=no]) + fi + + if test x"$enable_search" = "xyes"; then +- PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED], +- [tracker_api=0.14], +- [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED], +- [tracker_api=0.12], [tracker_api=0.10])]) + PKG_CHECK_MODULES(BRASERO_SEARCH, tracker-sparql-$tracker_api >= $TRACKER_REQUIRED) + AC_DEFINE(BUILD_SEARCH, 1, [define if you want to use search pane]) + AC_DEFINE(BUILD_TRACKER, 1, [define if you want to use search pane]) +-- +1.8.1 \ No newline at end of file diff --git a/brasero.spec b/brasero.spec index 0bb4964..b0d7beb 100644 --- a/brasero.spec +++ b/brasero.spec @@ -1,12 +1,13 @@ Summary: Disc burning application for GNOME Summary(pl.UTF-8): Program do wypalania płyt dla GNOME Name: brasero -Version: 3.6.1 +Version: 3.8.0 Release: 1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/3.6/%{name}-%{version}.tar.xz -# Source0-md5: 1bf94b5d75f4a003b3d139d50e620c7b +Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/3.8/%{name}-%{version}.tar.xz +# Source0-md5: 0a380af9dc134084fb04f54f2a656e6f +Patch0: %{name}-tracker016.patch URL: http://www.gnome.org/projects/brasero/ BuildRequires: autoconf BuildRequires: automake @@ -33,7 +34,7 @@ BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.592 BuildRequires: tar >= 1:1.22 BuildRequires: totem-pl-parser-devel >= 2.30.0 -BuildRequires: tracker-devel >= 0.14.0 +BuildRequires: tracker-devel >= 0.16.0 BuildRequires: xorg-lib-libICE-devel BuildRequires: xorg-lib-libSM-devel BuildRequires: xz @@ -120,6 +121,7 @@ Dodaje integrację Brasero z Nautilusem. %prep %setup -q +%patch0 -p1 %build %{__gtkdocize} -- 2.44.0