[nemo] add patch to build against tracker-1.8
leigh123linux
leigh123linux at fedoraproject.org
Mon Dec 23 00:46:14 UTC 2013
commit 9b7e6f8f3d8b3647f917fd5f94b8afdd8e18187e
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Mon Dec 23 00:45:48 2013 +0000
add patch to build against tracker-1.8
nemo.spec | 9 +++++++--
tracker-18.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/nemo.spec b/nemo.spec
index 80719e7..72c8f3d 100644
--- a/nemo.spec
+++ b/nemo.spec
@@ -3,7 +3,7 @@
Name: nemo
Summary: File manager for Cinnamon
Version: 2.0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+ and LGPLv2+
Group: User Interface/Desktops
URL: https://github.com/linuxmint/nemo
@@ -15,7 +15,8 @@ Source2: gtk.css
Source3: gtk-dark.css
Source4: nemo-fedora.gschema.override
-Patch0: git_rollup.patch
+Patch0: tracker-18.patch
+Patch1: git_rollup.patch
Requires: redhat-menus
Requires: gvfs
@@ -83,6 +84,7 @@ Nemo theme fix for Adwaita
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's at DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"@@g' configure.in
mv configure.in configure.ac
NOCONFIGURE=1 ./autogen.sh
@@ -185,6 +187,9 @@ fi
%{_datadir}/gir-1.0/*.gir
%changelog
+* Mon Dec 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.8-4
+- add patch to build against tracker-1.8
+
* Mon Dec 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.8-3
- change tracker build requires
diff --git a/tracker-18.patch b/tracker-18.patch
new file mode 100644
index 0000000..52e7fa0
--- /dev/null
+++ b/tracker-18.patch
@@ -0,0 +1,38 @@
+--- a/configure.in
++++ b/configure.in
+@@ -240,26 +240,21 @@ dnl Check for Tracker
+ dnl ===========================================================================
+
+ AC_ARG_ENABLE(tracker,
+- [AS_HELP_STRING([--enable-tracker=@<:@yes/no/auto@:>@],
+- [build Tracker builtin support [default=auto]])],
++ [AS_HELP_STRING([--enable-tracker=@<:@yes/no@:>@],
++ [build Tracker builtin support [default=yes]])],
+ [enable_tracker="$enableval"],
+- [enable_tracker=auto])
++ [enable_tracker=yes])
+
+-build_tracker=no
+ if test "x$enable_tracker" != "xno"; then
+- PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
+- [build_tracker=yes],
+- [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14,
+- [build_tracker=yes],
+- [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12,
+- [build_tracker=yes],
+- [build_tracker=no])])])
+- if test "x$build_tracker" = "xyes"; then
+- AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
++ if $PKG_CONFIG --exists tracker-sparql-0.18; then
++ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18)
++ else
++ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16)
+ fi
++ AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])
+ fi
+
+-AM_CONDITIONAL(ENABLE_TRACKER, test "x$build_tracker" = "xyes")
++AM_CONDITIONAL(ENABLE_TRACKER, test "x$enable_tracker" = "xyes")
+
+ dnl ==========================================================================
+
More information about the scm-commits
mailing list