Accepting request 35644 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/nautilus via accept of submit request 35644 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/35644
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=90
This commit is contained in:
Vincent Untz 2010-03-29 11:19:32 +00:00 committed by Git OBS Bridge
parent 7393d7bc4f
commit 16eee2cf7b
3 changed files with 25 additions and 6 deletions

9
mount-archive.desktop Normal file
View File

@ -0,0 +1,9 @@
[Desktop Entry]
Name=Archive Mounter
Exec=/usr/lib/gvfs/gvfsd-archive file=%u
MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip;
Terminal=false
StartupNotify=false
Type=Application
NoDisplay=true
OnlyShowIn=GNOME;

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Mar 24 13:55:04 CET 2010 - vuntz@opensuse.org
- Add mount-archive.desktop to enable mounting an archive via gvfs,
instead of opening it in file-roller. FATE#308344, bgo#602147.
- Stop creating %{_libdir}/nautilus/extensions-1.0: we don't
support extensions there anymore, so we shouldn't create the
directory.
-------------------------------------------------------------------
Fri Mar 12 12:15:22 CET 2010 - dimstar@opensuse.org

View File

@ -39,6 +39,8 @@ Version: 2.29.92.1
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
# fate#308344 bgo#602147
Source1: mount-archive.desktop
Source99: baselibs.conf
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -115,8 +117,6 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
### 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/places/gnome-fs-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
# ln -s ../icons/gnome/24x24/places/gnome-home.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 -N "Nautilus" -G "File Browser" nautilus System FileManager
@ -128,11 +128,13 @@ ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixm
%suse_update_desktop_file -G "File Browser" nautilus-home System FileManager
%suse_update_desktop_file -G "Nautilus Search Tool" nautilus-search System FileManager
%suse_update_desktop_file -G "File Browser" network-scheme System Network
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0
# Install the archive mime handler
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-2.0
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
%fdupes $RPM_BUILD_ROOT
%clean
@ -156,7 +158,7 @@ if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
%files -f %{name}.lst
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO
%{_bindir}/*
@ -170,7 +172,6 @@ fi
%{_libexecdir}/nautilus-convert-metadata
%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