pool/nautilus
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 429123 from GNOME:Factory

Browse Source 
New stable, the gtk bump was already done in our spec (forwarded request 428825 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/429123
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger 2016-09-21 16:39:03 +00:00 committed by Git OBS Bridge
commit e610c6f291
6 changed files with 125 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nautilus-3.20.3.tar.xz
View File

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

3
nautilus-3.22.0.tar.xz Normal file
View File

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

34
nautilus-enable-eject-option-on-selection-menu.patch
View File

@ -1,18 +1,18 @@
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index fd4f2f5..a4e62d6 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -6474,7 +6474,12 @@ real_update_actions_state (NautilusFilesView *view)
can_move_files && !selection_contains_recent);
Index: nautilus-3.21.91/src/nautilus-files-view.c
===================================================================
--- nautilus-3.21.91.orig/src/nautilus-files-view.c
+++ nautilus-3.21.91/src/nautilus-files-view.c
@@ -7218,7 +7218,12 @@ real_update_actions_state (NautilusFiles
can_move_files && !selection_contains_recent);
/* Drive menu */
- show_mount = show_unmount = show_eject = show_start = show_stop = show_detect_media = FALSE;
+ show_mount = (selection != NULL);
+ show_unmount = (selection != NULL);
+ show_eject = (selection != NULL);
+ show_start = (selection != NULL && selection_count == 1);
+ show_stop = (selection != NULL && selection_count == 1);
+ show_detect_media = (selection != NULL && selection_count == 1);
for (l = selection; l != NULL && (show_mount || show_unmount
|| show_eject
|| show_start || show_stop
/* Drive menu */
- show_mount = show_unmount = show_eject = show_start = show_stop = show_detect_media = FALSE;
+ show_mount = (selection != NULL);
+ show_unmount = (selection != NULL);
+ show_eject = (selection != NULL);
+ show_start = (selection != NULL && selection_count == 1);
+ show_stop = (selection != NULL && selection_count == 1);
+ show_detect_media = (selection != NULL && selection_count == 1);
for (l = selection; l != NULL && (show_mount || show_unmount
|| show_eject
|| show_start || show_stop

43
nautilus-fix-desktop-icon-smash.patch
View File

@ -1,22 +1,23 @@
diff -Nura nautilus-3.20.1/libnautilus-private/nautilus-canvas-container.c nautilus-3.20.1_new/libnautilus-private/nautilus-canvas-container.c
--- nautilus-3.20.1/libnautilus-private/nautilus-canvas-container.c 2016-04-28 09:27:24.000000000 +0000
+++ nautilus-3.20.1_new/libnautilus-private/nautilus-canvas-container.c 2016-06-23 14:03:49.500258624 +0000
@@ -1824,7 +1824,8 @@
}
/* Check and see if we need to move to a new column */
- if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height) {
+ if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height &&
+ height > 0 && total > 3) {
break;
}
Index: nautilus-3.21.91/src/nautilus-canvas-container.c
===================================================================
--- nautilus-3.21.91.orig/src/nautilus-canvas-container.c
+++ nautilus-3.21.91/src/nautilus-canvas-container.c
@@ -2039,7 +2039,8 @@ lay_down_icons_vertical_desktop (Nautilu
}
@@ -1867,7 +1868,7 @@
/* Check and see if we need to move to a new column */
if (y != DESKTOP_PAD_VERTICAL && y > height - icon_height_for_bound_check &&
/* Make sure we lay out at least one icon per column, to make progress */
- p != icons) {
+ p != icons && height > 0 && total > 3) {
x += column_width + DESKTOP_PAD_HORIZONTAL;
break;
}
/* Check and see if we need to move to a new column */
- if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height)
+ if (y != DESKTOP_PAD_VERTICAL && y + icon_height_for_bound_check > height &&
+ height > 0 && total > 3)
{
break;
}
@@ -2087,7 +2088,7 @@ lay_down_icons_vertical_desktop (Nautilu
/* Check and see if we need to move to a new column */
if (y != DESKTOP_PAD_VERTICAL && y > height - icon_height_for_bound_check &&
/* Make sure we lay out at least one icon per column, to make progress */
- p != icons)
+ p != icons && height > 0 && total > 3)
{
x += column_width + DESKTOP_PAD_HORIZONTAL;
break;

56
nautilus.changes
View File

@ -1,3 +1,59 @@
-------------------------------------------------------------------
Mon Sep 19 20:11:47 UTC 2016 - zaitor@opensuse.org
- Update to version 3.22.0:
+ Increase gtk+ depencency version.
+ Updated translations.
-------------------------------------------------------------------
Wed Sep 14 08:17:34 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.92:
+ Fix libgd warning.
+ Numerous batch renaming improvements and fixes.
+ Detect .bz and .xz as extensions for renaming.
+ Fix operations popover too small.
+ Add dummy --no-desktop option so Dropbox plugin works again.
+ Fix build when using the --disable-tracker compile time option.
+ Updated translations.
- Run spec-clean: Updates macros to current standard and adds
pkgconfig BuildRequires, also removes obsolete clean section.
- Conditionally BuildRequire and apply gnome-patch-translate and
translations-update-upstream for non-openSUSE only.
- Drop nautilus2-devel Obsoletes/Provides: We do not support
upgrading from any version where this would apply.
-------------------------------------------------------------------
Fri Sep 2 19:58:02 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.91.1:
+ mime-actions: Fix shift+control+down segfault on a folder.
+ Use templates for glib-mkenums.
+ Fix compiler warning.
+ batch-rename-utilities:
- Protect against null error.
- Print warnings if query goes wrong.
+ file-undo-operations: Add plural support for strings.
+ batch-rename-dialog: Add plural support for strings.
+ Updated translations.
- Drop nautilus-fix-compiler-warning.patch: Fixed upstream.
-------------------------------------------------------------------
Wed Aug 31 08:40:37 UTC 2016 - dimstar@opensuse.org
- Update to version 3.21.91:
+ Implement batch renaming tool.
+ Implement compressed files support.
+ Rework the view menus.
+ Separate desktop handling from Nautilus.
+ Add missing cut shortcut.
+ Add <ctrl>= as "zoom in" shortcut.
- Add pkgconfig(gnome-autoar-0) BuildRequires: new dependency.
- Rebase nautilus-enable-eject-option-on-selection-menu.patch and
nautilus-fix-desktop-icon-smash.patch.
- Add nautilus-fix-compiler-warning.patch: Fix function potentially
reching the end without returning a value.
-------------------------------------------------------------------
Tue Aug 30 13:30:03 UTC 2016 - dimstar@opensuse.org

51
nautilus.spec
View File

@ -17,39 +17,38 @@
Name: nautilus
Version: 3.20.3
Version: 3.22.0
Release: 0
Summary: File Manager for the GNOME Desktop
License: GPL-2.0+
Group: Productivity/File utilities
Source: http://download.gnome.org/sources/nautilus/3.20/%{name}-%{version}.tar.xz
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/nautilus/3.22/%{name}-%{version}.tar.xz
# fate#308344 bgo#602147
Source1: mount-archive.desktop
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM nautilus-enable-eject-option-on-selection-menu.patch bsc#981950 bgo#768355 tyang@suse.com -- Enable eject option on selection menu
Patch0: nautilus-enable-eject-option-on-selection-menu.patch
# PATCH-FIX-UPSTREAM nautilus-fix-desktop-icon-smash.patch bsc#979072 bgo#765601 qzhao@suse.com -- Fix icons smash at first boot
Patch2: nautilus-fix-desktop-icon-smash.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch1: nautilus-fix-desktop-icon-smash.patch
# needed for directory ownership
BuildRequires: dbus-1
BuildRequires: fdupes
BuildRequires: gnome-patch-translation
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: intltool >= 0.50
BuildRequires: libselinux-devel
# We need the %%mime_database_* macros
BuildRequires: pkgconfig
BuildRequires: shared-mime-info
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(exempi-2.0) >= 2.1.0
BuildRequires: pkgconfig(gail-3.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.45.7
BuildRequires: pkgconfig(gnome-autoar-0) >= 0.1
BuildRequires: pkgconfig(gnome-desktop-3.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.8.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.19.12
BuildRequires: pkgconfig(gtk+-3.0) >= 3.21.6
BuildRequires: pkgconfig(libexif) >= 0.6.20
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
@ -57,9 +56,12 @@ BuildRequires: pkgconfig(pango) >= 1.28.3
BuildRequires: pkgconfig(tracker-sparql-1.0)
Recommends: %{name}-lang
Recommends: gvfs
Provides: nautilus2 = %{version}
Obsoletes: nautilus2 < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires
%if !0%{?is_opensuse}
BuildRequires: gnome-patch-translation
BuildRequires: translation-update-upstream
%endif
%description
Nautilus is the file manager for the GNOME desktop.
@ -101,8 +103,6 @@ Summary: File Manager for the GNOME Desktop -- Development Files
Group: Development/Libraries/GNOME
Requires: %{name} = %{version}
Requires: typelib-1_0-Nautilus-3_0 = %{version}
Provides: nautilus2-devel = %{version}
Obsoletes: nautilus2-devel < %{version}
%description devel
Nautilus is the file manager for the GNOME desktop.
@ -110,21 +110,24 @@ Nautilus is the file manager for the GNOME desktop.
This package contains development files for nautilus.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch2 -p1
%patch1 -p1
%if !0%{?is_opensuse}
translation-update-upstream
%endif
%build
%configure\
--disable-update-mimedb \
--enable-gtk-doc
%__make %{?jobs:-j%jobs} V=1
make %{?_smp_mflags}
%install
%makeinstall
rm $RPM_BUILD_ROOT/%{_libdir}/{*.*a,nautilus/extensions-3.0/*.la}
make %{?_smp_mflags} DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -delete -print
%suse_update_desktop_file org.gnome.Nautilus
%suse_update_desktop_file nautilus-autorun-software
%suse_update_desktop_file nautilus-autostart
@ -132,12 +135,9 @@ rm $RPM_BUILD_ROOT/%{_libdir}/{*.*a,nautilus/extensions-3.0/*.la}
test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop
%{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop
%suse_update_desktop_file mount-archive
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-3.0
mkdir -p %{buildroot}/%{_libdir}/nautilus/extensions-3.0
%find_lang %{name} %{?no_lang_C}
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%fdupes %{buildroot}
%post
%glib2_gsettings_schema_post
@ -158,16 +158,18 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS COPYING MAINTAINERS NEWS README THANKS
%{_bindir}/*
%{_bindir}/nautilus
%{_bindir}/nautilus-autorun-software
%{_bindir}/nautilus-desktop
%{_datadir}/applications/*.desktop
%{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service
%{_datadir}/dbus-1/services/org.gnome.Nautilus.service
%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
%dir %{_libdir}/nautilus
%doc %{_mandir}/man1/nautilus*.1.gz
%{_mandir}/man1/nautilus*.1%{ext_man}
%{_sysconfdir}/xdg/autostart/nautilus-autostart.desktop
%dir %{_datadir}/appdata/
%{_datadir}/appdata/org.gnome.Nautilus.appdata.xml
%{_datadir}/icons/hicolor/*/apps/org.gnome.Nautilus*
%files -n libnautilus-extension1
%defattr(-,root,root)
@ -187,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gnome-shell/search-providers/nautilus-search-provider.ini
%files lang -f %{name}.lang
%defattr(-,root,root)
%files devel
%defattr(-,root,root)