Accepting request 101614 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/101614
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=106

nautilus-3.3.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f022e13bce5f8f4f993b4a4b169f7280c0c987879709e0f2821a9458196a0ab
-size 4722048

nautilus-3.3.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:373b2df2e17e12c03f7a47fe50b50198df204128cf892e58793d87b8f86fd85a
+size 4724604

nautilus-tracker-0.14.patch

@@ -0,0 +1,31 @@
+commit 88f18618ba15b952a739e410b910508f244b1fc3
+Author: Vincent Untz <vuntz@gnome.org>
+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")

nautilus.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jan 19 09:15:03 UTC 2012 - vuntz@opensuse.org
+
+- Add support for tracker 0.13/0.14:
+  + Add nautilus-tracker-0.14.patch.
+  + Add call to gnome-autogen.sh, needed for above patch.
+  + Change pkgconfig(tracker-sparql-0.12) BuildRequires to
+    pkgconfig(tracker-sparql-0.14).
+
+-------------------------------------------------------------------
+Tue Jan 17 07:45:57 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.3.4:
+  + Show both the current file counter and the total files in file
+    operations UI
+  + Lazily initialize the notification daemon
+  + Move the UI files and icons into GResources
+  + Refactor of NautilusWindowPane and NautilusWindowSlot code
+  + libnautilus-extension GIR coverage has been improved
+- Stop installing icons in /usr/share/pixmaps that we only needed
+  to make some build checks happy, and that are unneeded now.
+
 -------------------------------------------------------------------
 Mon Dec 19 12:38:58 UTC 2011 - vuntz@opensuse.org
 

nautilus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package nautilus
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,9 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           nautilus
-Version:        3.3.3
+Version:        3.3.4
 Release:        0
 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in
 Summary:        File Manager for the GNOME Desktop
@@ -29,6 +28,8 @@ 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)
@@ -36,6 +37,7 @@ 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
@@ -51,14 +53,14 @@ 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.4
+BuildRequires:  pkgconfig(glib-2.0) >= 2.31.9
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.3.7
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(tracker-sparql-0.12)
+BuildRequires:  pkgconfig(tracker-sparql-0.14)
 # So that symlinks to icons work:
 Requires:       gnome-icon-theme
 Recommends:     %{name}-lang
@@ -106,13 +108,15 @@ 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
-#NOCONFIGURE=1 gnome-autogen.sh
+# needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure\
 	--disable-update-mimedb \
 	--enable-gtk-doc
@@ -128,11 +132,6 @@ translation-update-upstream
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 rm $RPM_BUILD_ROOT/%{_libdir}/{*.*a,nautilus/extensions-3.0/*.la}
-### ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-# FIXME: this is probably wrong, but it enables the build to succeed for now
-# ln -s ../icons/gnome/24x24/devices/gnome-computer.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
 %suse_update_desktop_file nautilus
 %suse_update_desktop_file nautilus-autorun-software
 %suse_update_desktop_file nautilus-autostart
@@ -171,16 +170,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service
 %{_datadir}/dbus-1/services/org.gnome.Nautilus.service
-%{_datadir}/glib-2.0/schemas/*.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
-%{_datadir}/icons/hicolor/*/*/*.*
+%{_datadir}/icons/hicolor/*/apps/nautilus.*
-%{_datadir}/mime/packages/*.xml
+%{_datadir}/mime/packages/nautilus.xml
-%{_datadir}/nautilus
+%{_datadir}/nautilus/
-%{_datadir}/pixmaps/nautilus
-%{_datadir}/pixmaps/*.png
 %dir %{_libdir}/nautilus
 %{_libexecdir}/nautilus-convert-metadata
 %doc %{_mandir}/man1/nautilus*.1.gz
-%{_sysconfdir}/xdg/autostart/*.desktop
+%{_sysconfdir}/xdg/autostart/nautilus-autostart.desktop
 
 %files -n libnautilus-extension1
 %defattr(-,root,root)