Accepting request 427563 from GNOME:Next

New unstable, with cleanup

OBS-URL: https://build.opensuse.org/request/show/427563
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=261

nautilus-3.21.91.1.tar.xz

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

nautilus-3.21.92.tar.xz

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

nautilus.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+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
 

nautilus.spec

@@ -17,11 +17,12 @@
 
 
 Name:           nautilus
-Version:        3.21.91.1
+Version:        3.21.92
 Release:        0
 Summary:        File Manager for the GNOME Desktop
 License:        GPL-2.0+
 Group:          Productivity/File utilities
+Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/nautilus/3.21/%{name}-%{version}.tar.xz
 # fate#308344 bgo#602147
 Source1:        mount-archive.desktop
@@ -30,19 +31,16 @@ Source99:       baselibs.conf
 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
 Patch1:         nautilus-fix-desktop-icon-smash.patch
-Url:            http://www.gnome.org
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # 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)
@@ -50,7 +48,7 @@ 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
@@ -58,9 +56,12 @@ BuildRequires:  pkgconfig(pango) >= 1.28.3
 BuildRequires:  pkgconfig(tracker-sparql-1.0)
 Recommends:     %{name}-lang
 Recommends:     gvfs
-Provides:       nautilus2 = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Obsoletes:      nautilus2 < %{version}
 %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.
@@ -102,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.
@@ -111,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
 %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
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
-find %{buildroot} -type f -name '*.la' -print -delete
+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
@@ -133,12 +135,9 @@ find %{buildroot} -type f -name '*.la' -print -delete
 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
+%fdupes %{buildroot}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 %glib2_gsettings_schema_post
@@ -159,14 +158,14 @@ 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
+%{_mandir}/man1/nautilus*.1%{ext_man}
-%{_libdir}/nautilus/libgd.so
-%doc %{_mandir}/man1/nautilus*.1.gz
 %{_sysconfdir}/xdg/autostart/nautilus-autostart.desktop
 %dir %{_datadir}/appdata/
 %{_datadir}/appdata/org.gnome.Nautilus.appdata.xml
@@ -190,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)