OBS User unknown
2009-02-07 16:17:16 +00:00
committed by Git OBS Bridge
parent c4ac361c2c
commit a676dea12c
14 changed files with 199 additions and 596 deletions

View File

@@ -1,5 +1,5 @@
#
# spec file for package nautilus (Version 2.24.1)
# spec file for package nautilus (Version 2.25.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,8 +19,6 @@
Name: nautilus
BuildRequires: cdparanoia
BuildRequires: eel-devel
BuildRequires: fdupes
BuildRequires: fontconfig-devel
BuildRequires: gnome-common
@@ -28,20 +26,18 @@ BuildRequires: gnome-desktop-devel
BuildRequires: gnome-icon-theme
BuildRequires: gnome-patch-translation
BuildRequires: gtk-doc
BuildRequires: gvfs-devel
BuildRequires: intltool
BuildRequires: libbeagle-devel
BuildRequires: libexempi-devel
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel
BuildRequires: librsvg-devel
BuildRequires: perl-XML-Parser
BuildRequires: libxml2-devel
BuildRequires: unique-devel
BuildRequires: update-desktop-files
License: GPL v2 or later
Group: Productivity/File utilities
Version: 2.24.1
Release: 7
Version: 2.25.4
Release: 1
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
Url: http://www.gnome.org
@@ -50,29 +46,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch4: nautilus-bgo350950-search-desktop.diff
# PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 federico@novell.com - Use a folder icon instead of a file cabinet window
Patch5: nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
# PATCH-FIX-OPENSUSE nautilus-genericname.patch
Patch6: nautilus-genericname.patch
# PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch
Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch
# PATCH-FIX-UPSTREAM nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com
# PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio
Patch9: nautilus-146947-rename-bad-parameters-message.diff
# PATCH-FIX-UPSTREAM nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff bnc366100 bgo338933 federico@novell.com - ignore OnlyShowIn=KDE
Patch11: nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff
# PATCH-NEEDS-REBASE nautilus-212649-search-bar-visibility.patch bgo368424 federico@novell.com -- (was PATCH-FIX-UPSTREAM)
Patch12: nautilus-212649-search-bar-visibility.patch
# PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bgo335411 federico@novell.com
Patch15: nautilus-drives-and-volumes-on-desktop.diff
Patch17: nautilus-181941-i18n.patch
# PATCH-NEEDS-REBASE nautilus-330298-297983-fix-overlapping-desktop-icons.diff bgo330928 federico@novell.com
Patch18: nautilus-330298-297983-fix-overlapping-desktop-icons.diff
# PATCH-FIX-OPENSUSE nautilus-desktop-icon.patch
Patch19: nautilus-desktop-icon.patch
# PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com
Patch20: nautilus-bnc363122-lockdown-context-menus.diff
# PATCH-FEATURE-OPENSUSE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items
# PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE)
Patch21: nautilus-sysadmin-desktop-items.diff
# PATCH-FIX-UPSTREAM nautilus-new-windows-after-mount.patch bgo524485 bnc437780 hpj@suse.de -- Fix browser windows that sometimes don't show.
Patch22: nautilus-new-windows-after-mount.patch
Requires: %{name}-lang = %{version}
Requires: gvfs
# So that symlinks to icons work:
@@ -108,19 +89,11 @@ features of the Nautilus file manager.
gnome-patch-translation-prepare
%patch4 -p1
%patch5 -p1
%patch6 -p0
%patch7
%patch9 -p0
#%patch9 -p0
### %patch10
%patch11 -p1
### %patch12
### %patch15 -p1
%patch17 -p1
### %patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p0
#%patch21 -p1
gnome-patch-translation-update
%build
@@ -191,13 +164,18 @@ fi
%{_datadir}/pixmaps/*.png
%{_datadir}/icons/hicolor/*/*/*.*
%{_libdir}/*.so.*
%{_libdir}/bonobo/servers/*.server
%{_mandir}/man1/nautilus*.1.gz
%doc %{_mandir}/man1/nautilus*.1.gz
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-1.0
%dir %{_libdir}/nautilus/extensions-2.0
%files lang -f %{name}.lang
# remove the comment on the %if once bnc#470409 is fixed
#%if %suse_version <= 1110
# exclude locales which don't exist on old versions of openSUSE
%exclude %{_datadir}/locale/ha/LC_MESSAGES/*
%exclude %{_datadir}/locale/ig/LC_MESSAGES/*
#%endif
%files devel
%defattr(-,root,root)
@@ -208,6 +186,80 @@ fi
%{_datadir}/gtk-doc/html/libnautilus-extension
%changelog
* Tue Feb 03 2009 mboman@suse.de
- Update to version 2.25.4:
+ Don't show desktop files from other desktops than Gnome on the
desktop
+ Support crossfades of desktop backgrounds
+ Don't snap desktop icons outside right margin
+ Fix crashes and leaks
- nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff
was removed. Fixed upstream
- Remove nautilus-456702-trash-restore.patch. Fixed upstream
(See bgo#555234)
* Wed Jan 28 2009 vuntz@novell.com
- Manual merge from GNOME:Factory:Next, and update to 2.25.3.
- Update to version 2.25.3:
+ Remove CD/DVD creator from places menu and sidebar
+ Allow deleting custom emblems
+ Fix crashes
+ Don't show read-only emblems in trash
+ Trash performance fixes
+ General performance fixes
+ Update to new PackageKit API
- Changes from version 2.25.2:
+ Merged eel into nautilus
+ Use single glib/gtk includes
+ Support PackageKit application search
+ Fix new windows not appearing after successful mount
+ Remove support for old KDE trash dirs
- Changes from version 2.25.1:
+ Remove depencency on libgnome & gnome-vfs
+ Fix crashes
+ Chop trailing space characters when moving to FAT file system
+ When DnD'ing, COPY instead of MOVE, when the source is not
deletable
+ Don't set default when opening with other app, just add to open
with list.
+ Don't make copies of files from readonly source (e.g. CDROM)
readonly
+ Don't show cancel dialog when showing the "run or display"
dialog
- nautilus-sysadmin-desktop-items.diff needs to be rebased.
- nautilus-146947-rename-bad-parameters-message.diff also needs to
be rebased, also someone needs to investigate if it's still
needed.
- Drop nautilus-genericname.patch: we use %%update_desktop_file.
- Drop nautilus-new-windows-after-mount.patch: fixed upstream.
- Drop nautilus-disable-zoom-control-and-view-as-option-menu.patch:
we don't want to diverge from upstream like this. Fix bnc#462077.
- Drop nautilus-181941-i18n.patch: it's already fixed upstream, and
the patch was respinned without any reason.
- Drop nautilus-212649-search-bar-visibility.patch: the search bar
is visible when you go to x-nautilus-search:/// and we didn't
apply the patch anyway.
- Drop nautilus-330298-297983-fix-overlapping-desktop-icons.diff:
the patch wasn't applied and it's been fixed upstream since quite
some time.
- Merge nautilus-desktop-icon.patch in
nautilus-bgo350950-search-desktop.diff since it's what it was
patching.
- Update
nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff
to use GKeyFile.
- Trivial update to
nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff
- Remove useless BuildRequires: cdparanoia, eel-devel (included in
nautilus now), gvfs-devel, libidl-devel, librsvg-devel, and
perl-XML-Parser.
- Note: we keep libgnomeui-devel because the included libbackground
needs it.
- Add BuildRequires on libxml2-devel and unique-devel.
* Wed Jan 28 2009 vuntz@novell.com
- Updated nautilus-456702-trash-restore.patch to use the patch
committed upstream.
* Thu Jan 22 2009 mxwu@novell.com
- Added nautilus-456702-trash-restore.patch (bnc#456702)
* Thu Dec 04 2008 hpj@novell.com
- Added nautilus-new-windows-after-mount.patch (bnc#437780,
bgo#524485).