Hello community, here is the log from the commit of package nautilus checked in at Tue Jan 9 18:41:01 CET 2007. -------- --- GNOME/nautilus/nautilus.changes 2006-11-21 16:20:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2006-12-18 14:34:13.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 18 14:33:50 CET 2006 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.i13334/_old 2007-01-09 18:40:41.000000000 +0100 +++ /var/tmp/diff_new_pack.i13334/_new 2007-01-09 18:40:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nautilus (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,16 +11,13 @@ # norootforbuild Name: nautilus -BuildRequires: cdparanoia eel-devel gnome-common gnome-patch-translation intltool libbeagle-devel libexif libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +BuildRequires: cdparanoia eel-devel gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-devel libexif libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files License: GNU General Public License (GPL) Group: Productivity/File utilities -Autoreqprov: on Version: 2.16.1 -Release: 30 +Release: 41 Summary: The GNOME 2.x Desktop File Manager -Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.16/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch1: nautilus-config-defaults.patch @@ -39,11 +36,13 @@ Patch14: nautilus-206369-desktop-icon-overlap.diff Patch15: nautilus-drives-and-volumes-on-desktop.diff Patch16: nautilus-debug-log.diff -PreReq: filesystem gconf2 shared-mime-info -Requires: gnome2-user-docs +Requires: gnome2-user-docs gnome-icon-theme Provides: nautilus2 Obsoletes: nautilus2 Obsoletes: medusa < 0.6 +Autoreqprov: on + +%gconf_schemas_prereq %description This package contains Nautilus, the advanced file manager for the GNOME @@ -99,29 +98,21 @@ gnome-patch-translation-update %build -%{?suse_update_config:%{suse_update_config -f}} -libtoolize --force autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --libexecdir=%prefix/lib/nautilus \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/lib \ +# needed for nautilus-2.16.1: +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure\ --disable-update-mimedb # only for patch2: make nautilus.desktop src/network-scheme.desktop -make %{?jobs:-j %jobs} +make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -export LD_LIBRARY=$RPM_BUILD_ROOT/opt/gnome/%_lib make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -%find_lang %{name} rm docs/Makefile* +ln -s ../icons/gnome/24x24/devices/gnome-fs-client.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/48x48/apps/gnome-searchtool.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ %suse_update_desktop_file -N "Nautilus" -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus System FileManager %suse_update_desktop_file -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" network-scheme System Network %suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-computer System FileManager @@ -129,46 +120,57 @@ %suse_update_desktop_file -G "Nautilus Search Tool" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-search System FileManager %endif %suse_update_desktop_file -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-home System FileManager -ln -s /opt/gnome/share/icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{prefix}/share/pixmaps/gnome-fs-client.png -ln -s /opt/gnome/share/icons/gnome/24x24/places/gnome-fs-home.png $RPM_BUILD_ROOT%{prefix}/share/pixmaps/gnome-fs-home.png -mkdir -p $RPM_BUILD_ROOT/%prefix/%_lib/nautilus/extensions-1.0 +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0 +%find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre -f %{name}.schemas_pre %post %run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/apps_nautilus_preferences.schemas >/dev/null -usr/bin/update-mime-database usr/share/mime >/dev/null +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun %postun %run_ldconfig -usr/bin/update-mime-database usr/share/mime >/dev/null - -%clean -rm -rf $RPM_BUILD_ROOT +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi -%files -f %files -f %{name}.lang +%files -f %{name}.lst %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS ChangeLog MAINTAINERS NEWS README THANKS TODO docs/* -%{prefix}/bin/* -%{prefix}/%_lib/*.so.* -%{prefix}/%_lib/bonobo/servers/*.server -%dir %prefix/%_lib/nautilus -%dir %prefix/%_lib/nautilus/extensions-1.0 -%{prefix}/share/applications/*.desktop -%{prefix}/share/mime/packages/*.xml -%{prefix}/share/nautilus -%{prefix}/share/pixmaps/*.png -%{prefix}/share/pixmaps/nautilus -%{sysconfdir}/gconf/schemas/apps_nautilus_preferences.schemas +%{_bindir}/* +%{_datadir}/applications/*.desktop +%{_datadir}/mime/packages/*.xml +%{_datadir}/nautilus +%{_datadir}/pixmaps/nautilus +%{_datadir}/pixmaps/*.png +%{_libdir}/*.so.* +%{_libdir}/bonobo/servers/*.server +%dir %{_libdir}/nautilus +%dir %{_libdir}/nautilus/extensions-1.0 %files devel %defattr(-,root,root) -%{prefix}/%_lib/*.*a -%{prefix}/%_lib/*.so -%{prefix}/include/* -%{prefix}/%_lib/pkgconfig/*.pc +%{_libdir}/*.so +%{_libdir}/*.*a +%{_includedir}/* +%{_libdir}/pkgconfig/*.pc %changelog -n nautilus +* Mon Dec 18 2006 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Tue Nov 21 2006 - sbrabec@suse.cz - Do not explicitly require mDNSResponder-lib blocking avahi compat package. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org