Hello community,
here is the log from the commit of package gnome-panel for openSUSE:Factory
checked in at Mon Aug 9 18:31:31 CEST 2010.
--------
--- GNOME/gnome-panel/gnome-panel.changes 2010-06-04 11:21:21.000000000 +0200
+++ gnome-panel/gnome-panel.changes 2010-08-08 05:07:52.000000000 +0200
@@ -1,0 +2,56 @@
+Sun Aug 8 02:46:30 CEST 2010 - vuntz@opensuse.org
+
+- Cleanup update to 2.31.4.
+- Update to version 2.31.6:
+ + Panel
+ - Allow Windows key as valid mouse modifier
+ - Update to latest gdbus API change
+ + libpanel-applet
+ - GSeal fixes
+ + Workspace Switcher Applet
+ * Fix crash in multiscreen setups
+ + Updated translations.
+- Remove gnome-themes Requires: it's just wrong.
+- Remove gnome-control-center Recommends: there's no reason for it.
+- Update summaries and descriptions.
+- Fix license tags: the non-library code is GPLv2+, not LGPLv2.1+.
+- Create a bonobo-support subpackage: the support for bonobo
+ applets is optional, and this makes it easy to remove it when
+ possible.
+- Update packaging for /usr/share/gconf renaming to
+ /usr/share/GConf.
+- Reintroduce gnome-panel-bnc363981-intlclock-compatibility.patch,
+ but update it for the new way panel applets work.
+- Move panel-test-applets* utilities to devel subpackage, since
+ it's really only useful for developers.
+- Move old fish-related images to the extras subpackage.
+
+-------------------------------------------------------------------
+Thu Jul 8 10:55:01 CEST 2010 - dimstar@opensuse.org
+
+- Update to version 2.31.4:
+ + More GSeal fixes
+ + Stop using deprecated GTK+ API
+ + libpanel-applet
+ - Update to GDBus API change
+ - Add gobject-introspection support
+ + Clock Applet
+ - Add -lm when linking the clock applet
+ + Notification Area Applet
+ - Fix issues with old-style multiscreen setups
+ + Misc
+ - Make automatic detection of bonobo work in configure
+- Changes from version 2.31.2:
+ + All
+ - Provide a dbus-based applet library
+ - Keep an optional bonobo-based applet library
+ + Panel
+ - Make sure that newly-created panels become unhidden
+ + Misc
+ - Require glib 2.25.7
+ - Make orbit and bonobo dependencies optional
+ + Updated translations.
+- Drop gnome-panel-bnc363981-intlclock-compatibility.patch, as the
+ change away from bonobo obsoletes this.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-panel-2.30.0.tar.bz2
New:
----
gnome-panel-2.31.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-panel.spec ++++++
--- /var/tmp/diff_new_pack.2J0w0l/_old 2010-08-09 18:25:50.000000000 +0200
+++ /var/tmp/diff_new_pack.2J0w0l/_new 2010-08-09 18:25:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-panel (Version 2.30.0)
+# spec file for package gnome-panel (Version 2.31.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,10 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: gnome-panel
+Version: 2.31.6
+Release: 1
+# FIXME: remove workaround in %build that sets CFLAGS (instead of SUSE_ASNEEDED=1) once fixed (was introduced in 2.31.6)
+License: GPLv2+
+Summary: The GNOME 2.x Desktop Panel
+Url: http://www.gnome.org
+Group: System/GUI/GNOME
+Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
+Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM gnome-panel-recent-check-exists.patch -- Show an error when clicking on a recent item that doesn't exist anymore
+Patch25: gnome-panel-recent-check-exists.patch
+# PATCH-FIX-UPSTREAM gnome-panel-beagle-search.patch bgo336726 -- Use nautilus search instead of gnome-search-tool
+Patch34: gnome-panel-beagle-search.patch
+# PATCH-FIX-OPENSUSE gnome-panel-2-11-bring-back-my-run-item.patch -- Display the run dialog in the menu bar
+Patch35: gnome-panel-2-11-bring-back-my-run-item.patch
+# PATCH-FIX-OPENSUSE gnome-panel-main-menu-name.patch -- Rename the upstream main menu to traditional main menu
+Patch40: gnome-panel-main-menu-name.patch
+# PATCH-NEEDS-REBASE gnome-panel-run-fixes.patch bnc115576 bgo543604 -- Fix running a command like yast2 when we find the desktop file but the binary is not in $PATH (was PATCH-FIX-UPSTREAM)
+Patch50: gnome-panel-run-fixes.patch
+# PATCH-FEATURE-OPENSUSE gnome-panel-alt-f1-slab.patch -- Open the gnome-main-menu on Alt-F1.
+Patch51: gnome-panel-alt-f1-slab.patch
+# PATCH-FEATURE-UPSTREAM gnome-panel-recently-used-apps.patch bgo464751 -- Add apps run from the run dialog to the recently used applications. vuntz: I didn't put the patch upstream because I know I won't implement the feature like this upstream.
+Patch56: gnome-panel-recently-used-apps.patch
+# PATCH-FIX-OPENSUSE gnome-panel-bnc363981-intlclock-compatibility.patch bnc363981 vuntz@novell.com -- Keep compatilibity with setups using intlclock. Also fixes bnc376319
+Patch58: gnome-panel-bnc363981-intlclock-compatibility.patch
+# PATCH-FEATURE-OPENSUSE gnome-panel-bnc356242-recently-used-apps-hidden.patch bnc356242 vuntz@novell.com -- Hide recently used apps from the recent documents menu
+Patch61: gnome-panel-bnc356242-recently-used-apps-hidden.patch
BuildRequires: NetworkManager-devel
BuildRequires: dbus-1-devel
BuildRequires: evolution-data-server-devel
@@ -37,42 +63,15 @@
BuildRequires: librsvg-devel
BuildRequires: libwnck-devel
BuildRequires: licenses
+BuildRequires: pkg-config
BuildRequires: polkit-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
-BuildRequires: pkg-config
-License: LGPLv2.1+
-Group: Development/Libraries/GNOME
-Version: 2.30.0
-Release: 4
-Summary: The GNOME 2.x Desktop Panel
-Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
-Source99: baselibs.conf
-Url: http://www.gnome.org
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: gnome-themes licenses
-Recommends: gnome-main-menu gnome-control-center
Requires: %{name}-lang = %{version}
+Requires: licenses
# Required by clock/tz.c:
Requires: timezone
-# PATCH-FIX-UPSTREAM gnome-panel-recent-check-exists.patch -- Show an error when clicking on a recent item that doesn't exist anymore
-Patch25: gnome-panel-recent-check-exists.patch
-# PATCH-FIX-UPSTREAM gnome-panel-beagle-search.patch bgo336726 -- Use nautilus search instead of gnome-search-tool
-Patch34: gnome-panel-beagle-search.patch
-# PATCH-FIX-OPENSUSE gnome-panel-2-11-bring-back-my-run-item.patch -- Display the run dialog in the menu bar
-Patch35: gnome-panel-2-11-bring-back-my-run-item.patch
-# PATCH-FIX-OPENSUSE gnome-panel-main-menu-name.patch -- Rename the upstream main menu to traditional main menu
-Patch40: gnome-panel-main-menu-name.patch
-# PATCH-NEEDS-REBASE gnome-panel-run-fixes.patch bnc115576 bgo543604 -- Fix running a command like yast2 when we find the desktop file but the binary is not in $PATH (was PATCH-FIX-UPSTREAM)
-Patch50: gnome-panel-run-fixes.patch
-# PATCH-FEATURE-OPENSUSE gnome-panel-alt-f1-slab.patch -- Open the gnome-main-menu on Alt-F1.
-Patch51: gnome-panel-alt-f1-slab.patch
-# PATCH-FEATURE-UPSTREAM gnome-panel-recently-used-apps.patch bgo464751 -- Add apps run from the run dialog to the recently used applications. vuntz: I didn't put the patch upstream because I know I won't implement the feature like this upstream.
-Patch56: gnome-panel-recently-used-apps.patch
-# PATCH-FIX-OPENSUSE gnome-panel-bnc363981-intlclock-compatibility.patch bnc363981 vuntz@novell.com -- Keep compatilibity with setups using intlclock. Also fixes bnc376319
-Patch58: gnome-panel-bnc363981-intlclock-compatibility.patch
-# PATCH-FEATURE-OPENSUSE gnome-panel-bnc356242-recently-used-apps-hidden.patch bnc356242 vuntz@novell.com -- Hide recently used apps from the recent documents menu
-Patch61: gnome-panel-bnc356242-recently-used-apps-hidden.patch
+Recommends: gnome-main-menu
Obsoletes: gnome-core
# For upgrade from SLE 10
Provides: gnome-panel-nld > 2.12.3
@@ -80,6 +79,7 @@
# As of Jan 2008, intlclock is part of gnome-panel.
Provides: intlclock = 1.0
Obsoletes: intlclock < 1.0
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
%description
@@ -87,47 +87,93 @@
easy-to-use and functional interface to manage your desktop, start
programs, and organize access to your data.
+%package bonobo-support
+License: GPLv2+
+Summary: Bonobo Applets Support for GNOME Panel
+Group: System/GUI/GNOME
+Requires: %{name} = %{version}
+# Automatically install the bonobo support if the bonobo-based library is
+# installed
+Supplements: packageand(%{name}:libpanel-applet-2-0)
+%glib2_gio_module_requires
+
+%description bonobo-support
+This package contains the GNOME 2.x Desktop Panel. The panel is an
+easy-to-use and functional interface to manage your desktop, start
+programs, and organize access to your data.
+
+This package contains the support for bonobo-based applets in the
+GNOME panel.
+
%package -n libpanel-applet-2-0
License: LGPLv2.1+
-Summary: GNOME Panel Applet Library
+Summary: GNOME Panel Applet Library -- Bonobo-based library
Group: System/GUI/GNOME
%description -n libpanel-applet-2-0
-This package contains the library used by GNOME panel applets.
+This package contains the GNOME 2.x Desktop Panel. The panel is an
+easy-to-use and functional interface to manage your desktop, start
+programs, and organize access to your data.
-%package extras
+This package contains the library used by GNOME panel applets,
+based on bonobo.
+
+%package -n libpanel-applet-3-0
License: LGPLv2.1+
+Summary: GNOME Panel Applet Library -- D-Bus-based library
+Group: System/GUI/GNOME
+
+%description -n libpanel-applet-3-0
+This package contains the GNOME 2.x Desktop Panel. The panel is an
+easy-to-use and functional interface to manage your desktop, start
+programs, and organize access to your data.
+
+This package contains the library used by GNOME panel applets,
+based on D-Bus.
+
+%package extras
+License: GPLv2+
Summary: Extra panel applets
Group: System/GUI/GNOME
-Requires: %{name} = %{version} fortune
+Requires: %{name} = %{version}
+Requires: fortune
# For upgrade from SLE 10
Provides: gnome-panel-nld-extras > 2.12.3
Obsoletes: gnome-panel-nld-extras <= 2.12.3
%gconf_schemas_prereq
%description extras
+This package contains the GNOME 2.x Desktop Panel. The panel is an
+easy-to-use and functional interface to manage your desktop, start
+programs, and organize access to your data.
+
This package contains extra panel applets such as Wanda the fish.
%package devel
License: LGPLv2.1+
-Summary: Include Files and Libraries mandatory for Development
-Group: System/GUI/GNOME
+Summary: GNOME Panel Applet Library -- Development Files
+Group: Development/Libraries/GNOME
Requires: libpanel-applet-2-0 = %{version}
+Requires: libpanel-applet-3-0 = %{version}
Requires: gconf2-devel
Requires: gtk2-devel
-Requires: libgnomeui-devel
Requires: libbonoboui-devel
+Requires: libgnomeui-devel
# For upgrade from SLE 10
Provides: gnome-panel-nld-devel > 2.12.3
Obsoletes: gnome-panel-nld-devel <= 2.12.3
%description devel
+This package contains the GNOME 2.x Desktop Panel. The panel is an
+easy-to-use and functional interface to manage your desktop, start
+programs, and organize access to your data.
+
This package contains all necessary include files and libraries needed
to develop applications that require these.
%package doc
License: LGPLv2.1+
-Summary: Additional Package Documentation for gnome-panel
+Summary: GNOME Panel Applet Library -- Developer Documentation
Group: System/GUI/GNOME
Requires: %{name} = %{version}
# For upgrade from SLE 10
@@ -135,6 +181,10 @@
Obsoletes: gnome-panel-nld-doc <= 2.12.3
%description doc
+This package contains the GNOME 2.x Desktop Panel. The panel is an
+easy-to-use and functional interface to manage your desktop, start
+programs, and organize access to your data.
+
This package contains optional documentation provided in addition to
this package's base documentation.
@@ -150,18 +200,21 @@
# %patch50
%patch51 -p0
%patch56 -p0
-%patch58 -p0
+%patch58 -p1
%patch61 -p0
gnome-patch-translation-update
%build
+#export SUSE_ASNEEDED=1
+# This is a workaround due to dbus port not completed yet.
+export CFLAGS="%{optflags} -ldbus-glib-1"
%configure --with-pic \
--libexecdir=%{_libexecdir}/gnome-panel \
--disable-static \
--with-in-process-applets=all \
--disable-schemas-install \
--disable-scrollkeeper
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
%install
%makeinstall
@@ -173,6 +226,7 @@
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
+touch %{buildroot}%{_libdir}/gnome-panel/modules/giomodule.cache
%suse_update_desktop_file gnome-panel
%find_lang %{name}-2.0
%find_lang clock %{name}-2.0.lang
@@ -189,100 +243,142 @@
%def_gconf_schemas %{name}-extras
%add_gconf_schemas fish
%end_gconf_schemas
+cat fish.lang %{name}-extras.schemas_list >%{name}-extras.lst
# NOTE: GCONF_CONFIG_SOURCE is already set by %%posttrans code.
sed -i /GCONF_CONFIG_SOURCE/d %{name}.schemas_posttrans
-cat %{name}.schemas_list >%{name}.lst
-cat fish.lang %{name}-extras.schemas_list >%{name}-extras.lst
# Move .entries file to /usr/share/gconf/schemas, see fate#305318
-mv $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/gconf/schemas/panel-default-setup.entries
+mv %{buildroot}%{_sysconfdir}/gconf/schemas/panel-default-setup.entries %{buildroot}%{_datadir}/GConf/schemas/panel-default-setup.entries
for FILE in COPYING ; do
MD5SUM=$(md5sum $FILE | sed 's/ .*//g')
if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then
ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE
fi
done
-find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
-%fdupes $RPM_BUILD_ROOT
+find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+%fdupes %{buildroot}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
%posttrans -f %{name}.schemas_posttrans
export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load usr/share/gconf/schemas/panel-default-setup.entries >/dev/null
+usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load usr/share/GConf/schemas/panel-default-setup.entries >/dev/null
%preun -f %{name}.schemas_preun
# Remove extra keys from panel-default-setup.entries.
# If it is an update, %%posttrans will install new schemas.
rm -rf etc/gconf/gconf.xml.schemas/apps/panel/default_setup
+%post bonobo-support
+%glib2_gio_module_post %{_libdir}/gnome-panel/modules
+
+%postun bonobo-support
+%glib2_gio_module_postun %{_libdir}/gnome-panel/modules
+
%post -n libpanel-applet-2-0 -p /sbin/ldconfig
%postun -n libpanel-applet-2-0 -p /sbin/ldconfig
+%post -n libpanel-applet-3-0 -p /sbin/ldconfig
+
+%postun -n libpanel-applet-3-0 -p /sbin/ldconfig
+
%pre extras -f %{name}-extras.schemas_pre
%posttrans extras -f %{name}-extras.schemas_posttrans
%preun extras -f %{name}-extras.schemas_preun
-%files -f %{name}.lst
+%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%defattr (-, root, root)
-%{_bindir}/*
-%{_datadir}/applications/gnome-panel.desktop
-%{_datadir}/dbus-1/system-services/*.service
-%{_datadir}/gconf/schemas/panel-default-setup.entries
-%{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gnome-panel/
-%{_datadir}/gnome-panelrc
-%{_datadir}/icons/*/*/*/gnome-panel*.*
-%{_datadir}/idl/*
-%{_datadir}/polkit-1/actions/*.policy
-%{_libdir}/bonobo/servers/*.server
# generic directory for in-process applets
-%{_libdir}/gnome-panel/
+%dir %{_libdir}/gnome-panel
+# directory for modules to load applets
+%dir %{_libdir}/gnome-panel/modules
+%ghost %{_libdir}/gnome-panel/modules/giomodule.cache
%if "%{_libdir}" != "%{_libexecdir}"
# generic directory for normal applets, and helpers
-%{_libexecdir}/gnome-panel/
+%dir %{_libexecdir}/gnome-panel
%endif
-%doc %{_mandir}/man?/*.*
-%config %{_sysconfdir}/dbus-1/system.d/*.conf
+%{_bindir}/gnome-desktop-item-edit
+%{_bindir}/gnome-panel
+%{_datadir}/applications/gnome-panel.desktop
+%{_datadir}/GConf/schemas/panel-default-setup.entries
+%{_datadir}/gnome-panel/
+%{_datadir}/gnome-panelrc
+%{_datadir}/icons/hicolor/*/apps/gnome-panel*.*
+%doc %{_mandir}/man?/gnome-panel.*
+%{_libexecdir}/gnome-panel/gnome-panel-add
+# Internal applets
+%{_libdir}/gnome-panel/*.so
+# Files related to the polkit helper from the clock
+%{_libexecdir}/gnome-panel/gnome-clock-applet-mechanism
+%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
+%config %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
# Files that are in the extras package
+%exclude %{_datadir}/gnome-panel/applets/org.gnome.panel.FishApplet.panel-applet
+%exclude %{_datadir}/gnome-panel/pixmaps/fishanim.png
+%exclude %{_datadir}/gnome-panel/pixmaps/footguy.png
+%exclude %{_datadir}/gnome-panel/pixmaps/monkey.png
+%exclude %{_datadir}/gnome-panel/pixmaps/oldwanda.png
%exclude %{_datadir}/gnome-panel/ui/fish.ui
-%exclude %{_datadir}/gnome-panel/pixmaps/fish*.png
-%exclude %{_datadir}/gnome-2.0/ui/GNOME_FishApplet.xml
-%exclude %{_datadir}/icons/*/*/*/gnome-panel-fish.*
-%exclude %{_libdir}/gnome-panel/libfish-applet-2.so
-%exclude %{_libdir}/bonobo/servers/GNOME_FishApplet_Factory.server
+%exclude %{_datadir}/gnome-panel/ui/fish-menu.xml
+%exclude %{_datadir}/icons/hicolor/*/apps/gnome-panel-fish.*
+%exclude %{_libdir}/gnome-panel/libfish-applet.so
+# Files that are in the devel package
+%exclude %{_datadir}/gnome-panel/ui/panel-test-applets.ui
+%exclude %{_datadir}/gnome-panel/ui/panel-test-applets-bonobo.ui
+
+%files bonobo-support
+%defattr (-, root, root)
+%{_libdir}/gnome-panel/modules/libpanel-applets-bonobo.so
+%{_datadir}/gnome-2.0/ui/GNOME_Panel_Popup.xml
+%{_datadir}/idl/gnome-panel-2.0/
%files -n libpanel-applet-2-0
%defattr (-, root, root)
-%{_libdir}/*.so.*
+%{_libdir}/libpanel-applet-2.so.*
+
+%files -n libpanel-applet-3-0
+%defattr (-, root, root)
+%{_libdir}/libpanel-applet-3.so.*
%files lang -f %{name}-2.0.lang
%files extras -f %{name}-extras.lst
%defattr (-, root, root)
# When changing the file list here, please update the excluded files in the main package
+%{_datadir}/gnome-panel/applets/org.gnome.panel.FishApplet.panel-applet
+%{_datadir}/gnome-panel/pixmaps/fishanim.png
+%{_datadir}/gnome-panel/pixmaps/footguy.png
+%{_datadir}/gnome-panel/pixmaps/monkey.png
+%{_datadir}/gnome-panel/pixmaps/oldwanda.png
+# Note that wanda.png is actually used by gnome-panel directly too, so it shouldn't be here
%{_datadir}/gnome-panel/ui/fish.ui
-%{_datadir}/gnome-panel/pixmaps/fish*.png
-%{_datadir}/gnome-2.0/ui/GNOME_FishApplet.xml
-%{_datadir}/icons/*/*/*/gnome-panel-fish.*
-%{_libdir}/gnome-panel/libfish-applet-2.so
-%{_libdir}/bonobo/servers/GNOME_FishApplet_Factory.server
+%{_datadir}/gnome-panel/ui/fish-menu.xml
+%{_datadir}/icons/hicolor/*/apps/gnome-panel-fish.*
+%{_libdir}/gnome-panel/libfish-applet.so
%files devel
%defattr (-, root, root)
-%{_includedir}/panel-2.0
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_bindir}/panel-test-applets
+%{_bindir}/panel-test-applets-bonobo
+%{_datadir}/gnome-panel/ui/panel-test-applets.ui
+%{_datadir}/gnome-panel/ui/panel-test-applets-bonobo.ui
+%{_includedir}/gnome-panel-3.0/
+%{_includedir}/panel-2.0/
+%{_libdir}/libpanel-applet-2.so
+%{_libdir}/libpanel-applet-3.so
+%{_libdir}/pkgconfig/libpanelapplet-2.0.pc
+%{_libdir}/pkgconfig/libpanelapplet-3.0.pc
%files doc
%defattr (-, root, root)
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc/html/panel-applet/
%changelog
++++++ gnome-panel-2.30.0.tar.bz2 -> gnome-panel-2.31.6.tar.bz2 ++++++
++++ 125729 lines of diff (skipped)
++++++ gnome-panel-bnc363981-intlclock-compatibility.patch ++++++
--- /var/tmp/diff_new_pack.2J0w0l/_old 2010-08-09 18:25:52.000000000 +0200
+++ /var/tmp/diff_new_pack.2J0w0l/_new 2010-08-09 18:25:52.000000000 +0200
@@ -1,60 +1,13 @@
-Index: applets/clock/clock.c
+Index: gnome-panel-2.31.6/applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
===================================================================
---- applets/clock/clock.c.orig 2010-01-13 09:20:45.000000000 +1100
-+++ applets/clock/clock.c 2010-01-14 11:31:24.000000000 +1100
-@@ -3697,7 +3697,9 @@ clock_factory (PanelApplet *applet,
- {
- gboolean retval = FALSE;
-
-- if (!strcmp (iid, "OAFIID:GNOME_ClockApplet"))
-+ if (!strcmp (iid, "OAFIID:GNOME_ClockApplet") ||
-+ !strcmp (iid, "OAFIID:IntlClockApplet") ||
-+ !strcmp (iid, "OAFIID:GNOME_ClassicClockApplet"))
- retval = fill_clock_applet (applet);
-
- return retval;
-Index: applets/clock/GNOME_ClockApplet_Factory.server.in.in
-===================================================================
---- applets/clock/GNOME_ClockApplet_Factory.server.in.in.orig 2009-04-20 03:45:09.000000000 +1000
-+++ applets/clock/GNOME_ClockApplet_Factory.server.in.in 2010-01-14 11:31:24.000000000 +1100
-@@ -32,4 +32,40 @@
-
participants (1)
-
root@hilbert.suse.de