From 380ba537bdde45492f0b69bde85026a654186ca94f9a0113855b2fd5ee1d0385 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Feb 2012 10:59:58 +0000 Subject: [PATCH] Accepting request 103009 from home:vuntz:branches:GNOME:Factory Update to 3.3.5 OBS-URL: https://build.opensuse.org/request/show/103009 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=156 --- nautilus-3.3.4.tar.xz | 3 --- nautilus-3.3.5.tar.xz | 3 +++ nautilus-tracker-0.14.patch | 31 ------------------------------- nautilus.changes | 17 +++++++++++++++++ nautilus.spec | 12 ++---------- 5 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 nautilus-3.3.4.tar.xz create mode 100644 nautilus-3.3.5.tar.xz delete mode 100644 nautilus-tracker-0.14.patch diff --git a/nautilus-3.3.4.tar.xz b/nautilus-3.3.4.tar.xz deleted file mode 100644 index 0b5f76f..0000000 --- a/nautilus-3.3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:373b2df2e17e12c03f7a47fe50b50198df204128cf892e58793d87b8f86fd85a -size 4724604 diff --git a/nautilus-3.3.5.tar.xz b/nautilus-3.3.5.tar.xz new file mode 100644 index 0000000..13d2740 --- /dev/null +++ b/nautilus-3.3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ca1504da1ea079ae60244fa7f8014ab92e7693882c083c0995dfc6377918b22 +size 4542540 diff --git a/nautilus-tracker-0.14.patch b/nautilus-tracker-0.14.patch deleted file mode 100644 index 3096e40..0000000 --- a/nautilus-tracker-0.14.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 88f18618ba15b952a739e410b910508f244b1fc3 -Author: Vincent Untz -Date: Thu Jan 19 10:26:14 2012 +0100 - - build: Support build against tracker 0.13/0.14 - - https://bugzilla.gnome.org/show_bug.cgi?id=667853 - -diff --git a/configure.in b/configure.in -index f89522a..a762e00 100644 ---- a/configure.in -+++ b/configure.in -@@ -280,10 +280,14 @@ AC_ARG_ENABLE(tracker, - - build_tracker=no - if test "x$enable_tracker" != "xno"; then -- PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, [ -- build_tracker=yes -- AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support])], -- build_tracker=no) -+ 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]) -+ fi - fi - - AM_CONDITIONAL(ENABLE_TRACKER, test "x$build_tracker" = "xyes") diff --git a/nautilus.changes b/nautilus.changes index c5a9472..eb67230 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Feb 7 10:37:46 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.5: + + Introduce Undo support for common file operations + + Fix a crash when middle clicking icons on the desktop + + Fix split view actions not updating properly + + Fix wrong places sidebar selection under some locales + + Fix a crash when enabling desktop icons handling + + Support build against Tracker 0.13/0.14 + + Make the rubberband animation obey the global GtkSetting +- Remove xz BuildRequires now that it comes for free in the build + system. +- Drop nautilus-tracker-0.14.patch: fixed upstream. +- Drop gnome-common BuildRequires and call to gnome-autogen.sh: + they were only needed for above patch. + ------------------------------------------------------------------- Thu Jan 19 09:15:03 UTC 2012 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 6aa97f2..0c3d989 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: nautilus -Version: 3.3.4 +Version: 3.3.5 Release: 0 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop @@ -28,8 +29,6 @@ Source1: mount-archive.desktop Source99: baselibs.conf Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-FIX-UPSTREAM nautilus-tracker-0.14.patch bgo#667853 vuntz@opensuse.org -- Support tracker 0.13/0.14 -Patch0: nautilus-tracker-0.14.patch # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) @@ -37,8 +36,6 @@ Patch21: nautilus-sysadmin-desktop-items.diff # needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes -# needed for patch0 -BuildRequires: gnome-common BuildRequires: gnome-icon-theme BuildRequires: gnome-patch-translation BuildRequires: gobject-introspection-devel @@ -50,8 +47,6 @@ BuildRequires: libselinux-devel BuildRequires: shared-mime-info BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(gail-3.0) BuildRequires: pkgconfig(glib-2.0) >= 2.31.9 BuildRequires: pkgconfig(gnome-desktop-3.0) @@ -108,15 +103,12 @@ This package contains development files for nautilus. %prep %setup -q translation-update-upstream -%patch0 -p1 #gnome-patch-translation-prepare ### %patch15 -p1 #%patch21 -p1 #gnome-patch-translation-update %build -# needed for patch0 -NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ --enable-gtk-doc