From 19f86b4ae79f4008a5659535cd7bc3ae93618e426a6c4607d83242e2ea0385be Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 14 Nov 2011 13:42:14 +0000 Subject: [PATCH 1/3] Accepting request 91080 from home:dimstar:GNOME:Next Pushing current Gnome 3.3 work to G:F... some work might be lumpy... OBS-URL: https://build.opensuse.org/request/show/91080 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=149 --- nautilus-3.2.1.tar.bz2 | 3 --- nautilus-3.3.1.1.tar.bz2 | 3 +++ nautilus.changes | 14 ++++++++++++++ nautilus.spec | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 nautilus-3.2.1.tar.bz2 create mode 100644 nautilus-3.3.1.1.tar.bz2 diff --git a/nautilus-3.2.1.tar.bz2 b/nautilus-3.2.1.tar.bz2 deleted file mode 100644 index c5c0c01..0000000 --- a/nautilus-3.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:584e97d3eb093ee16a779809b679150a636bcd4a3767fb604993013b523d2df1 -size 5665334 diff --git a/nautilus-3.3.1.1.tar.bz2 b/nautilus-3.3.1.1.tar.bz2 new file mode 100644 index 0000000..ac96ec4 --- /dev/null +++ b/nautilus-3.3.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09b4cd84b3f73cd5711980fb108daf2f9ecd64e3f1d1dabdb20ea854b2096240 +size 5659728 diff --git a/nautilus.changes b/nautilus.changes index 04c6272..736badc 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 26 20:54:49 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.1.1: + + No changes, only a fixed tarball release. +- Changes from version 3.3.1: + + Show a Properties item in the sidebar for mounts + + Use GtkStyleContext to draw editable label elements + + Port to use GtkGrid + + Don't use deprecated GThread API + + Fix pie chart background rendering in Properties view + + Fix a crasher when activating a sidebar item + + Cleanup old libeel boilerplate code + ------------------------------------------------------------------- Tue Oct 18 06:29:38 UTC 2011 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index b052410..e9209a8 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -20,11 +20,11 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 3.2.1 +Version: 3.3.1.1 Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop -Source: http://download.gnome.org/sources/nautilus/3.2/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/nautilus/3.3/%{name}-%{version}.tar.bz2 # fate#308344 bgo#602147 Source1: mount-archive.desktop Source99: baselibs.conf From ba9ab558521c8a4f941369229a6e7ff2dc350ff6f43616d13bf2d644bb166bca Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 12 Dec 2011 16:01:36 +0000 Subject: [PATCH 2/3] Accepting request 96177 from home:dimstar:branches:GNOME:Factory Push typelib change branch OBS-URL: https://build.opensuse.org/request/show/96177 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=150 --- nautilus.changes | 5 +++++ nautilus.spec | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nautilus.changes b/nautilus.changes index 736badc..8f9c95c 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 9 09:00:13 UTC 2011 - dimstar@opensuse.org + +- Split typelib file in typelib-1_0-Nautilus-3_0. + ------------------------------------------------------------------- Wed Oct 26 20:54:49 UTC 2011 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index e9209a8..699698f 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -73,18 +73,25 @@ Nautilus is the file manager for the GNOME desktop. License: GPLv2+ Group: System/Libraries Summary: File Manager for the GNOME Desktop -- Extension Library -Summary: File Manager for the GNOME Desktop -- Extension Library %description -n libnautilus-extension1 Nautilus is the file manager for the GNOME desktop. This package contains the library used by nautilus extensions. +%package -n typelib-1_0-Nautilus-3_0 +Summary: File Manager for the GNOME Desktop -- Extension Library +Group: System/Libraries + +%description -n typelib-1_0-Nautilus-3_0 +Nautilus is the file manager for the GNOME desktop. + %package devel License: GPLv2+ Summary: File Manager for the GNOME Desktop -- Development Files Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel gtk2-devel +Requires: typelib-1_0-Nautilus-3_0 = %{version} Provides: nautilus2-devel = %{version} Obsoletes: nautilus2-devel < %{version} @@ -175,11 +182,14 @@ rm -rf $RPM_BUILD_ROOT %files -n libnautilus-extension1 %defattr(-,root,root) %{_libdir}/libnautilus-extension.so.1* -%{_libdir}/girepository-1.0/Nautilus-3.0.typelib %dir %{_libdir}/nautilus %dir %{_libdir}/nautilus/extensions-3.0 %{_libdir}/nautilus/extensions-3.0/*.so +%files -n typelib-1_0-Nautilus-3_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/Nautilus-3.0.typelib + %files lang -f %{name}.lang %files devel From 0032ec0d6f4d9e1ad7fb1a2c54248f93d949e50a2a4dbd243dd42855e0252909 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:48:31 +0000 Subject: [PATCH 3/3] Accepting request 97281 from home:vuntz:branches:GNOME:Factory Update to 3.3.3 OBS-URL: https://build.opensuse.org/request/show/97281 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=151 --- nautilus-3.3.1.1.tar.bz2 | 3 --- nautilus-3.3.3.tar.xz | 3 +++ nautilus.changes | 21 ++++++++++++++++++++- nautilus.spec | 25 ++++++++++++++----------- 4 files changed, 37 insertions(+), 15 deletions(-) delete mode 100644 nautilus-3.3.1.1.tar.bz2 create mode 100644 nautilus-3.3.3.tar.xz diff --git a/nautilus-3.3.1.1.tar.bz2 b/nautilus-3.3.1.1.tar.bz2 deleted file mode 100644 index ac96ec4..0000000 --- a/nautilus-3.3.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09b4cd84b3f73cd5711980fb108daf2f9ecd64e3f1d1dabdb20ea854b2096240 -size 5659728 diff --git a/nautilus-3.3.3.tar.xz b/nautilus-3.3.3.tar.xz new file mode 100644 index 0000000..a1bdd32 --- /dev/null +++ b/nautilus-3.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f022e13bce5f8f4f993b4a4b169f7280c0c987879709e0f2821a9458196a0ab +size 4722048 diff --git a/nautilus.changes b/nautilus.changes index 8f9c95c..9b965c1 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,7 +1,26 @@ +------------------------------------------------------------------- +Mon Dec 19 12:38:58 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Implement the org.freedesktop.FileManager1 DBus interface + + Show context menu for current folder when clicking empty space + in list view + + Sort XDG dirs in the places sidebar according to the current + locale + + Fix handling of Ctrl+T on the desktop window + + Fix icon view wrap-around key navigation + + Fix rubberband scrolling in maximized windows + + Fix a crasher when closing a window + + Don't use deprecated GLib and GTK functions +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. + ------------------------------------------------------------------- Fri Dec 9 09:00:13 UTC 2011 - dimstar@opensuse.org -- Split typelib file in typelib-1_0-Nautilus-3_0. +- Split typelib file into typelib-1_0-Nautilus-3_0 subpackage. +- Add typelib-1_0-Nautilus-3_0 Requires to devel subpackage. ------------------------------------------------------------------- Wed Oct 26 20:54:49 UTC 2011 - dimstar@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 699698f..78645cc 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -16,15 +16,14 @@ # - Name: nautilus -License: GPLv2+ -Group: Productivity/File utilities -Version: 3.3.1.1 -Release: 1 +Version: 3.3.3 +Release: 0 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop -Source: http://download.gnome.org/sources/nautilus/3.3/%{name}-%{version}.tar.bz2 +License: GPL-2.0+ +Group: Productivity/File utilities +Source: http://download.gnome.org/sources/nautilus/3.3/%{name}-%{version}.tar.xz # fate#308344 bgo#602147 Source1: mount-archive.desktop Source99: baselibs.conf @@ -49,8 +48,10 @@ 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) +BuildRequires: pkgconfig(glib-2.0) >= 2.31.4 BuildRequires: pkgconfig(gnome-desktop-3.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libexif) @@ -70,9 +71,8 @@ Obsoletes: nautilus2 < %{version} Nautilus is the file manager for the GNOME desktop. %package -n libnautilus-extension1 -License: GPLv2+ -Group: System/Libraries Summary: File Manager for the GNOME Desktop -- Extension Library +Group: System/Libraries %description -n libnautilus-extension1 Nautilus is the file manager for the GNOME desktop. @@ -80,14 +80,16 @@ Nautilus is the file manager for the GNOME desktop. This package contains the library used by nautilus extensions. %package -n typelib-1_0-Nautilus-3_0 -Summary: File Manager for the GNOME Desktop -- Extension Library +Summary: File Manager for the GNOME Desktop -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Nautilus-3_0 Nautilus is the file manager for the GNOME desktop. +This package provides the GObject Introspection bindings for the library +used by nautilus extensions. + %package devel -License: GPLv2+ Summary: File Manager for the GNOME Desktop -- Development Files Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel gtk2-devel @@ -167,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_datadir}/GConf/gsettings/*.convert %{_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}/icons/hicolor/*/*/*.*