From b8cff9a301ffd4bd94631a79b829ff7ca0e91dee Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mar 03 2014 13:50:14 +0000 Subject: remove tracker support (bz 1071601) so search works --- diff --git a/nemo.css b/nemo.css index 276e12b..75a1188 100644 --- a/nemo.css +++ b/nemo.css @@ -1,7 +1,7 @@ /* desktop mode */ .nemo-desktop.nemo-canvas-item { color: @bg_color; - text-shadow: 1 1 alpha (#000000, 0.8); + text-shadow: 1px 1px alpha (#000000, 0.8); } .nemo-desktop.nemo-canvas-item:active { diff --git a/nemo.spec b/nemo.spec index 1b4412f..91149fc 100644 --- a/nemo.spec +++ b/nemo.spec @@ -3,7 +3,7 @@ Name: nemo Summary: File manager for Cinnamon Version: 2.0.8 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops URL: https://github.com/linuxmint/nemo @@ -15,11 +15,10 @@ Source2: gtk.css Source3: gtk-dark.css Source4: nemo-fedora.gschema.override -Patch0: tracker-18.patch -Patch1: git_rollup.patch -Patch2: Fix_rename_entry_position.patch -Patch3: transparent_background.patch -Patch4: adwaita_style.patch +Patch0: git_rollup.patch +Patch1: Fix_rename_entry_position.patch +Patch2: transparent_background.patch +Patch3: adwaita_style.patch Requires: redhat-menus Requires: gvfs @@ -39,7 +38,6 @@ BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libnotify) -BuildRequires: tracker-devel # the main binary links against libnemo-extension.so # don't depend on soname, rather on exact version @@ -94,8 +92,8 @@ NOCONFIGURE=1 ./autogen.sh %build %configure --disable-more-warnings \ --disable-update-mimedb \ - --disable-schemas-compile - + --disable-schemas-compile \ + --enable-tracker=no sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool @@ -179,7 +177,7 @@ fi %{_libdir}/girepository-1.0/*.typelib %dir %{_libdir}/nemo -%files -n adwaita-nemo +%files -n su %{_datadir}/themes/Adwaita-Nemo/ %files devel @@ -189,6 +187,10 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Mon Mar 03 2014 Leigh Scott - 2.0.8-9 +- remove tracker support (bz 1071601) so search works +- fix adwaita-nemo theme issue (bz 1066547) + * Thu Feb 20 2014 Adam Williamson - 2.0.8-8 - rebuild against updated tracker diff --git a/tracker-18.patch b/tracker-18.patch deleted file mode 100644 index 46f25c2..0000000 --- a/tracker-18.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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-1.0; then -+ PKG_CHECK_MODULES(TRACKER, tracker-sparql-1.0) -+ else -+ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18) - 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 ========================================================================== -