From f968e284149ed475977927b5cdae7c10c986736a643d113df4a6d287e2c577b4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 Aug 2010 15:55:17 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/nautilus revision 82.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=013ac3718ea67ec546e22119fbc3ee19 --- nautilus-bgo350950-search-desktop.diff | 3 +- nautilus-no-disable-deprecated.patch | 26 +++++++++++++ nautilus.changes | 24 ++++++++++++ nautilus.spec | 53 +++++++++++++++++--------- 4 files changed, 86 insertions(+), 20 deletions(-) create mode 100644 nautilus-no-disable-deprecated.patch diff --git a/nautilus-bgo350950-search-desktop.diff b/nautilus-bgo350950-search-desktop.diff index 9bd9f55..3394762 100644 --- a/nautilus-bgo350950-search-desktop.diff +++ b/nautilus-bgo350950-search-desktop.diff @@ -29,7 +29,7 @@ Index: nautilus-2.27.1/data/nautilus-search.desktop.in =================================================================== --- /dev/null +++ nautilus-2.27.1/data/nautilus-search.desktop.in -@@ -0,0 +1,113 @@ +@@ -0,0 +1,114 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Search for Files... @@ -140,6 +140,7 @@ Index: nautilus-2.27.1/data/nautilus-search.desktop.in +Type=Application +StartupNotify=true +Categories=Core; ++OnlyShowIn=GNOME; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=nautilus +X-GNOME-Bugzilla-Component=general diff --git a/nautilus-no-disable-deprecated.patch b/nautilus-no-disable-deprecated.patch new file mode 100644 index 0000000..b93a63b --- /dev/null +++ b/nautilus-no-disable-deprecated.patch @@ -0,0 +1,26 @@ +Index: nautilus-2.30.1/configure +=================================================================== +--- nautilus-2.30.1.orig/configure ++++ nautilus-2.30.1/configure +@@ -19329,7 +19329,7 @@ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" + + +-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" ++DISABLE_DEPRECATED_CFLAGS="" + + + +Index: nautilus-2.30.1/configure.in +=================================================================== +--- nautilus-2.30.1.orig/configure.in ++++ nautilus-2.30.1/configure.in +@@ -339,7 +339,7 @@ AC_SUBST(CORE_CFLAGS) + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" + AC_SUBST(CORE_LIBS) + +-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" ++DISABLE_DEPRECATED_CFLAGS="" + AC_SUBST(DISABLE_DEPRECATED_CFLAGS) + + dnl Multimedia keys diff --git a/nautilus.changes b/nautilus.changes index e0d9ef6..5d73cbc 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Aug 6 10:50:55 CEST 2010 - vuntz@opensuse.org + +- Split out libnautilus-extension1 to reduce packages dependencies. + Thanks to Andrea Florio . +- Add nautilus-no-disable-deprecated.patch to fix build with recent + versions of GTK+ that have more deprecations. +- Make the build verbose. +- Improve summaries and descriptions. + +------------------------------------------------------------------- +Mon Jun 14 11:24:19 CEST 2010 - vuntz@opensuse.org + +- Do not change the nautilus-browser, nautilus-computer, + nautilus-home, network-scheme .desktop files: they have + OnlyShowIn=GNOME and they are not supposed to be visible (but + they became visible because we changed them). +- Do not change the nautilus .desktop file: it has NoDisplay=true + anyway. +- Update nautilus-bgo350950-search-desktop.diff to have + OnlyShowIn=GNOME; and do not change nautilus-search.desktop with + suse_update_dekstop_file since this item is not visible in the + menus. + ------------------------------------------------------------------- Wed May 26 15:59:10 UTC 2010 - sshaw@decriptor.com diff --git a/nautilus.spec b/nautilus.spec index 1e62c38..0bd4312 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -44,14 +44,16 @@ BuildRequires: update-desktop-files License: GPLv2+ Group: Productivity/File utilities Version: 2.30.1 -Release: 3 -Summary: The GNOME 2.x Desktop File Manager +Release: 6 +Summary: File Manager for the GNOME Desktop 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 +# PATCH-FIX-OPENSUSE nautilus-no-disable-deprecated.patch vuntz@opensuse.org -- Do not build with *_DISABLE_DEPRECATED flags +Patch0: nautilus-no-disable-deprecated.patch # PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface Patch4: nautilus-bgo350950-search-desktop.diff # PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 bgo581584 federico@novell.com - Use a folder icon instead of a file cabinet window @@ -75,30 +77,38 @@ Obsoletes: nautilus2 < %{version} %gconf_schemas_prereq %description -This package contains Nautilus, the advanced file manager for the GNOME -2.x Desktop platform. +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 +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 devel License: GPLv2+ -Summary: Development Package for Nautilus +Summary: File Manager for the GNOME Desktop -- Development Files Group: Development/Libraries/GNOME Requires: %{name} = %{version} glib2-devel gtk2-devel Provides: nautilus2-devel = %{version} Obsoletes: nautilus2-devel < %{version} -%description devel -This package contains all files needed to develop programs that use -features of the Nautilus file manager. - +%description devel +Nautilus is the file manager for the GNOME desktop. +This package contains development files for nautilus. %lang_package %prep %setup -q translation-update-upstream gnome-patch-translation-prepare +%patch0 -p1 %patch4 -p1 %patch5 -p1 #%patch9 -p0 @@ -113,7 +123,7 @@ NOCONFIGURE=1 gnome-autogen.sh %configure\ --disable-update-mimedb \ --enable-gtk-doc -%__make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall @@ -130,15 +140,15 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.*a # ln -s ../icons/gnome/24x24/devices/gnome-computer.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 +%suse_update_desktop_file nautilus %suse_update_desktop_file nautilus-autorun-software -%suse_update_desktop_file -r nautilus-browser System FileManager -%suse_update_desktop_file nautilus-computer System FileManager +%suse_update_desktop_file nautilus-browser +%suse_update_desktop_file nautilus-computer %suse_update_desktop_file nautilus-file-management-properties System FileManager X-SuSE-ControlCenter-LookAndFeel %suse_update_desktop_file nautilus-folder-handler -%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 +%suse_update_desktop_file nautilus-home +%suse_update_desktop_file nautilus-search +%suse_update_desktop_file network-scheme # Install the archive mime handler test ! -e %{buildroot}%{_datadir}/applications/mount-archive.desktop %{__install} -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mount-archive.desktop @@ -154,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %post -/sbin/ldconfig if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi @@ -164,11 +173,14 @@ fi %preun -f %{name}.schemas_preun %postun -/sbin/ldconfig if test -x usr/bin/update-mime-database ; then usr/bin/update-mime-database usr/share/mime >/dev/null fi +%post -n libnautilus-extension1 -p /sbin/ldconfig + +%postun -n libnautilus-extension1 -p /sbin/ldconfig + %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO @@ -179,11 +191,14 @@ fi %{_datadir}/pixmaps/nautilus %{_datadir}/pixmaps/*.png %{_datadir}/icons/hicolor/*/*/*.* -%{_libdir}/*.so.* %{_libexecdir}/nautilus-convert-metadata %doc %{_mandir}/man1/nautilus*.1.gz + +%files -n libnautilus-extension1 +%defattr(-,root,root) %dir %{_libdir}/nautilus %dir %{_libdir}/nautilus/extensions-2.0 +%{_libdir}/libnautilus-extension.so.* %files lang -f %{name}.lang