Hello community, here is the log from the commit of package gnome-main-menu checked in at Sat Mar 3 17:15:21 CET 2007. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2007-02-07 12:27:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2007-02-28 21:04:58.449841000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 28 21:04:24 CET 2007 - jimmyk@suse.de + +- Update to SP1 version of the main-menu. + +------------------------------------------------------------------- Old: ---- gnome-main-menu-0.6.3-package-manager.patch gnome-main-menu-0.6.3.tar.bz2 New: ---- gnome-main-menu-0.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.j32340/_old 2007-03-03 17:15:07.000000000 +0100 +++ /var/tmp/diff_new_pack.j32340/_new 2007-03-03 17:15:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-main-menu (Version 0.6.3) +# spec file for package gnome-main-menu (Version 0.9.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,21 +11,21 @@ # norootforbuild Name: gnome-main-menu -BuildRequires: NetworkManager-devel NetworkManager-glib gnome-common gnome-desktop-devel gnome-menus-devel gnome-panel-devel gtk-doc intltool libgnomeui-devel libgtop-devel librsvg-devel mDNSResponder-devel scrollkeeper update-desktop-files wireless-tools +BuildRequires: NetworkManager-devel NetworkManager-glib gnome-common gnome-desktop-devel gnome-menus-devel gnome-panel-devel gtk-doc intltool libgnomeui-devel libgtop-devel librsvg-devel mDNSResponder-devel nautilus-devel scrollkeeper update-desktop-files wireless-tools %if %suse_version < 1020 BuildRequires: NetworkManager-gnome %endif License: GNU General Public License (GPL) Group: System/GUI/GNOME -Version: 0.6.3 -Release: 61 +Autoreqprov: on +Version: 0.9.5 +Release: 1 Summary: The GNOME Desktop Menu -Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}-package-manager.patch +Source: %{name}-%{version}.tar.gz Patch1: %{name}-desktop.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: gnome-panel dbus-1-glib hal tango-icon-theme gnome-system-monitor wireless-tools +Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools Autoreqprov: on %gconf_schemas_prereq @@ -43,6 +43,7 @@ %package devel Summary: The GNOME Desktop Menu Group: System/GUI/GNOME +Autoreqprov: on Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel librsvg-devel Requires: gnome-desktop-devel gnome-menus-devel glib2-devel pango-devel @@ -56,27 +57,38 @@ Scott Reeves <sreeves@novell.com> Jimmy Krehl <jimmyk@novell.com> +%package -n nautilus-gnome-main-menu +Summary: The GNOME Desktop Menu +Group: System/GUI/GNOME +Autoreqprov: on + +%description -n nautilus-gnome-main-menu +The GNOME Desktop Menu and Application Browser. + + + +Authors: +-------- + Scott Reeves <sreeves@novell.com> + Jimmy Krehl <jimmyk@novell.com> + %prep %setup -n gnome-main-menu-%{version} -%patch -p1 %patch1 -# No English IGID Gibberish: -rm po/en_IGID.* -sed -i "s/(ALL_LINGUAS.*) en_IGID /\1 /" configure.in %build -autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS" -%configure\ - --libexecdir=%{_prefix}/lib\ +%configure \ + --libexecdir=%{_prefix}/lib/%{name} \ + --enable-nautilus-extension \ --disable-static make %{?jobs:-j%jobs} %install %makeinstall -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/gnome/autostart -cp application-browser/etc/application-browser.desktop $RPM_BUILD_ROOT/%{_datadir}/gnome/autostart/ -sed -i "/^Exec=/ s/application-browser *$/application-browser -h/" $RPM_BUILD_ROOT/%{_datadir}/gnome/autostart/application-browser.desktop +mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/autostart +cp application-browser/etc/application-browser.desktop $RPM_BUILD_ROOT/%{_prefix}/share/autostart/ +sed -i "/^Exec=/ s/application-browser *$/application-browser -h/" $RPM_BUILD_ROOT/%{_prefix}/share/autostart/application-browser.desktop %find_lang %{name} %find_gconf_schemas cat %{name}.lang %{name}.schemas_list >%{name}.lst @@ -88,22 +100,6 @@ %post %run_ldconfig -# For SLES the default "Favorite Apps" list is different. -if [[ -e /etc/SuSE-release && `grep 'SUSE Linux Enterprise Server' /etc/SuSE-release` ]] ; then - cat <<EOF | patch -p0; ---- etc/opt/gnome/gconf/schemas/slab.schemas 2006-05-22 16:34:43.000000000 -0400 -+++ etc/opt/gnome/gconf/schemas/slab.schemas 2006-05-24 15:54:41.000000000 -0400 -@@ -6,7 +6,7 @@ - <owner>gnome-main-menu</owner> - <type>list</type> - <list_type>string</list_type> -- <default>[MozillaFirefox.desktop,evolution.desktop,banshee.desktop,writer.desktop,f-spot.desktop,nautilus-home.desktop]</default> -+ <default>[MozillaFirefox.desktop,YaST.desktop,gnome-terminal.desktop,nautilus-home.desktop]</default> - <locale name="C"> - <short>.desktop files for "Favorite Applications"</short> - <long>.desktop files for "Favorite Applications"</long> -EOF -fi %posttrans -f %{name}.schemas_posttrans @@ -112,27 +108,49 @@ %postun %run_ldconfig -%files -f %{name}.lst +%files -f %{name}.lang %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{_bindir}/* -%{_datadir}/applications/*.desktop -%{_datadir}/gnome-2.0/ui/GNOME_MainMenu_ContextMenu.xml -%{_datadir}/gnome/autostart/application-browser.desktop -%{_libdir}/bonobo/servers/GNOME_MainMenu.server -%{_libdir}/*.so.* -%{_prefix}/lib/main-menu -# FIXME: Bad package for ownership, maybe even bad directory for installation. -%dir %{_datadir}/gnome/autostart +%{_sysconfdir}/gconf/schemas/slab.schemas +%{_sysconfdir}/gconf/schemas/control-center.schemas +%{_sysconfdir}/gconf/schemas/application-browser.schemas +%dir %{_prefix}/share/gnome-main-menu +%{_prefix}/share/gnome-main-menu/applications.xbel +%{_prefix}/share/gnome-main-menu/documents.xbel +%{_prefix}/share/gnome-main-menu/places.xbel +%{_prefix}/share/gnome-main-menu/system-items.xbel +%{_prefix}/share/gnome-main-menu/slab-window.glade +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/main-menu +%{_prefix}/bin/application-browser +%{_prefix}/bin/control-center +%{_prefix}/%{_lib}/bonobo/servers/GNOME_MainMenu.server +%{_prefix}/%{_lib}/*.so.* +%{_prefix}/share/applications/application-browser.desktop +%{_prefix}/share/applications/control-center.desktop +%{_prefix}/share/applications/gnome-screensaver-lock.desktop +%{_prefix}/share/applications/gnome-session-kill.desktop +%{_prefix}/share/gnome-2.0/ui/GNOME_MainMenu_ContextMenu.xml +%dir %{_prefix}/share/autostart +%{_prefix}/share/autostart/application-browser.desktop +%dir %{_prefix}/share/locale/en_IGID +%dir %{_prefix}/share/locale/en_IGID/LC_MESSAGES %files devel %defattr (-, root, root) -%{_includedir}/* -%{_libdir}/*.*a -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_prefix}/%_lib/pkgconfig/*.pc +%{_prefix}/%{_lib}/*.*a +%{_prefix}/%{_lib}/*.so +%{_prefix}/include/slab + +%files -n nautilus-gnome-main-menu +%defattr (-, root, root) +%{_prefix}/%{_lib}/nautilus/extensions-1.0/*.so +%{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la -%changelog -n gnome-main-menu +%changelog +* Wed Feb 28 2007 - jimmyk@suse.de +- Update to SP1 version of the main-menu. * Wed Feb 07 2007 - sbrabec@suse.cz - Do not build unusable static libraries (#238552). * Mon Feb 05 2007 - sbrabec@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org