rpms/gnome-panel/devel dont-build-clock.patch, NONE, 1.1 intlclock-changes-20071005.patch, NONE, 1.1 timezone-changes.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 gnome-panel.spec, 1.225, 1.226 sources, 1.61, 1.62

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Fri Oct 5 14:40:59 UTC 2007


Author: mclasen

Update of /cvs/extras/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12697

Modified Files:
	.cvsignore gnome-panel.spec sources 
Added Files:
	dont-build-clock.patch intlclock-changes-20071005.patch 
	timezone-changes.patch 
Log Message:
Replace clock by intlclock


dont-build-clock.patch:

--- NEW FILE dont-build-clock.patch ---
diff -up gnome-panel-2.20.0.1/Makefile.am.replace-clock-by-intlclock gnome-panel-2.20.0.1/Makefile.am
diff -up gnome-panel-2.20.0.1/applets/Makefile.am.replace-clock-by-intlclock gnome-panel-2.20.0.1/applets/Makefile.am
--- gnome-panel-2.20.0.1/applets/Makefile.am.replace-clock-by-intlclock	2007-10-05 10:04:56.000000000 -0400
+++ gnome-panel-2.20.0.1/applets/Makefile.am	2007-10-05 10:05:03.000000000 -0400
@@ -1,5 +1,4 @@
 SUBDIRS =		\
-	clock		\
 	fish		\
 	notification_area \
 	wncklet

intlclock-changes-20071005.patch:

--- NEW FILE intlclock-changes-20071005.patch ---
diff --git a/configure.in b/configure.in
index 4e818da..6c75db1 100644
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ if test -n "$LIBECAL_REQUIREMENT"; then
 fi
 AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
 
-PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT ])
+PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
 
 AC_SUBST(INTLCLOCK_CFLAGS)
 AC_SUBST(INTLCLOCK_LIBS)
diff --git a/data/GNOME_IntlClockApplet.xml b/data/GNOME_IntlClockApplet.xml
index dd2e8b8..152f26c 100644
--- a/data/GNOME_IntlClockApplet.xml
+++ b/data/GNOME_IntlClockApplet.xml
@@ -1,9 +1,6 @@
 <Root>
   <popups>
     <popup name="button3">
-      <menuitem name="Clock Configure Item" verb="IntlClockConfig"
-                _label="Cha_nge Date or Time"
-		pixtype="stock" pixname="gtk-preferences"/>
       <menuitem name="Clock Preferences Item" verb="IntlClockPreferences" _label="_Preferences"
     		    pixtype="stock" pixname="gtk-properties"/>
     </popup>
diff --git a/data/GNOME_IntlClockApplet_Factory.server.in.in b/data/GNOME_IntlClockApplet_Factory.server.in.in
index 1446822..705fb76 100644
--- a/data/GNOME_IntlClockApplet_Factory.server.in.in
+++ b/data/GNOME_IntlClockApplet_Factory.server.in.in
@@ -20,7 +20,7 @@
         </oaf_attribute>
         <oaf_attribute name="name" type="string" value="International Clock"/>
         <oaf_attribute name="description" type="string" value="International Clock applet for the GNOME panel"/>
-        <oaf_attribute name="panel:icon" type="string" value="clock.png"/>
+        <oaf_attribute name="panel:icon" type="string" value="gnome-panel-clock"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_ClockApplet"
diff --git a/data/intlclock.glade b/data/intlclock.glade
index e7b8c01..b23ade0 100644
--- a/data/intlclock.glade
+++ b/data/intlclock.glade
@@ -26,7 +26,7 @@
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkNotebook" id="notebook1">
+	<widget class="GtkNotebook" id="notebook">
 	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
@@ -37,194 +37,35 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkTable" id="table1">
-	      <property name="border_width">6</property>
+	    <widget class="GtkVBox" id="vbox17">
+	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
-	      <property name="n_rows">4</property>
-	      <property name="n_columns">3</property>
 	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">6</property>
-	      <property name="column_spacing">6</property>
+	      <property name="spacing">18</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label11">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Clock options:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label12">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label13">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label14">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label15">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
[...9298 lines suppressed...]
+
+static void
+free_data (gpointer d)
+{
+	SetTimeCallbackData *data = d;
+
+	data->ref_count--;
+	if (data->ref_count == 0) {
+		if (data->notify)
+			data->notify (data->data);
+		g_free (data);
+	}
+}
+
+static void set_time_async (SetTimeCallbackData *data);
+
+static void 
+auth_notify (DBusGProxy     *proxy,
+             DBusGProxyCall *call,
+             void           *user_data)
+{
+	SetTimeCallbackData *data = user_data;
+	GError *error = NULL;
+	gboolean gained_privilege;
+
+	g_print ("ending async ShowDialog call\n");
+	if (dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &gained_privilege, G_TYPE_INVALID)) {
+		g_print ("result: %d\n", gained_privilege);
+		if (gained_privilege)
+			set_time_async (data);
+	}
+	else {
+		if (data->callback) 
+			data->callback (data->data, error);
+		else
+			g_error_free (error);
+	}
+}
+
+static void
+do_auth_async (const gchar         *action, 
+               const gchar         *result, 
+               SetTimeCallbackData *data)
+{
+        DBusGConnection *bus;
+	DBusGProxy *proxy;
+
+	g_debug ("helper refused; returned polkit_result='%s' and polkit_action='%s'",
+		 result, action);
+
+	/* Now ask the user for auth... */
+        bus = get_session_bus ();
+	if (bus == NULL)
+		return;
+
+	proxy = dbus_g_proxy_new_for_name (bus,
+					"org.gnome.PolicyKit",
+					"/org/gnome/PolicyKit/Manager",
+					"org.gnome.PolicyKit.Manager");
+	
+	g_print ("beginning async ShowDialog call\n");
+	data->ref_count++;
+	dbus_g_proxy_begin_call_with_timeout (proxy,
+					      "ShowDialog",
+					      auth_notify,
+					      data, free_data,
+					      INT_MAX,
+					      G_TYPE_STRING, action,
+					      G_TYPE_UINT, 0,
+					      G_TYPE_INVALID);
+}
+
+static void
+set_time_notify (DBusGProxy     *proxy,
+		 DBusGProxyCall *call,
+		 void           *user_data)
+{
+	SetTimeCallbackData *data = user_data;
+	GError *error = NULL;
+
+	g_print ("ending async SetTime call\n");
+	if (dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID)) {
+		g_print ("calling user callback\n");
+		if (data->callback) 
+			data->callback (data->data, NULL);
+	}
+	else {
+		if (dbus_g_error_has_name (error, "org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
+			gchar **tokens;
+
+			tokens = g_strsplit (error->message, " ", 2);
+			g_error_free (error);                            
+			if (g_strv_length (tokens) == 2) 
+				do_auth_async (tokens[0], tokens[1], data);
+			else
+				g_warning ("helper return string malformed");
+			g_strfreev (tokens);
+		}
+		else {
+			if (data->callback)
+				data->callback (data->data, error);
+			else
+				g_error_free (error);
+		}		
+	}
+}
+
+static void
+set_time_async (SetTimeCallbackData *data)
+{
+        DBusGConnection *bus;
+        DBusGProxy      *proxy;
+	DBusGProxyCall  *call;
+
+        bus = get_system_bus ();
+        if (bus == NULL)
+                return;
+
+	proxy = dbus_g_proxy_new_for_name (bus,
+					   "org.gnome.ClockApplet.Mechanism",
+					   "/",
+					   "org.gnome.ClockApplet.Mechanism");
+
+	g_print ("beginning async SetTime call\n");
+	data->ref_count++;
+	dbus_g_proxy_begin_call_with_timeout (proxy, 
+					      "SetTime",
+					      set_time_notify,
+					      data, free_data,
+					      INT_MAX,
+					      /* parameters: */
+					      G_TYPE_INT64, data->time,
+					      G_TYPE_INVALID,
+					      /* return values: */
+					      G_TYPE_INVALID);
+}
+
+void
+set_system_time_async (gint64         time, 
+		       GFunc          callback, 
+		       gpointer       d, 
+		       GDestroyNotify notify)
+{
+	SetTimeCallbackData *data;
+
+	if (time == -1)
+		return;
+
+	data = g_new (SetTimeCallbackData, 1);
+	data->ref_count = 1;
+	data->time = time;
+	data->callback = callback;
+	data->data = d;
+	data->notify = notify;
+
+	set_time_async (data);
+	free_data (data);
+}
diff --git a/src/set-timezone.h b/src/set-timezone.h
new file mode 100644
index 0000000..c71622c
--- /dev/null
+++ b/src/set-timezone.h
@@ -0,0 +1,36 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 David Zeuthen <david at fubar.dk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __SET_SYSTEM_TIMEZONE_H__
+
+#include <time.h>
+
+gboolean set_system_timezone     (const char  *filename, 
+                                  GError     **err);
+gint     can_set_system_timezone (void);
+
+gint     can_set_system_time     (void);
+
+void     set_system_time_async   (gint64         time,
+                                  GFunc          callback,
+                                  gpointer       data,
+                                  GDestroyNotify notify);
+
+#endif

timezone-changes.patch:

--- NEW FILE timezone-changes.patch ---
diff -up timezone/Makefile.timezone-changes timezone/Makefile
--- timezone/Makefile.timezone-changes	2007-09-28 18:44:36.000000000 -0400
+++ timezone/Makefile	2007-10-05 01:22:40.000000000 -0400
@@ -11,18 +11,23 @@ gnome-clock-applet-mechanism-gtk : demo.
 	gcc -g -o gnome-clock-applet-mechanism-gtk `pkg-config --libs --cflags gthread-2.0 dbus-glib-1 gtk+-2.0` demo.c
 
 install:
-	cp org.gnome.ClockApplet.Mechanism.service /usr/share/dbus-1/system-services
-	cp org.gnome.ClockApplet.Mechanism.conf /etc/dbus-1/system.d
-	cp gnome-clock-applet-mechanism /usr/libexec
-	cp gnome-clock-applet-mechanism-gtk /usr/bin
-	cp gnome-clock-applet-mechanism.policy /usr/share/PolicyKit/policy
+	../mkinstalldirs $(DESTDIR)/usr/share/dbus-1/system-services
+	cp org.gnome.ClockApplet.Mechanism.service $(DESTDIR)/usr/share/dbus-1/system-services
+	../mkinstalldirs $(DESTDIR)/etc/dbus-1/system.d
+	cp org.gnome.ClockApplet.Mechanism.conf $(DESTDIR)/etc/dbus-1/system.d
+	../mkinstalldirs $(DESTDIR)/usr/libexec
+	cp gnome-clock-applet-mechanism $(DESTDIR)/usr/libexec
+	../mkinstalldirs $(DESTDIR)/usr/bin
+	cp gnome-clock-applet-mechanism-gtk $(DESTDIR)/usr/bin
+	../mkinstalldirs $(DESTDIR)/usr/share/PolicyKit/policy
+	cp gnome-clock-applet-mechanism.policy $(DESTDIR)/usr/share/PolicyKit/policy
 
 uninstall:
-	rm -f /usr/share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-	rm -f /etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-	rm -f /usr/libexec/gnome-clock-applet-mechanism
-	rm -f /usr/bin/gnome-clock-applet-mechanism-gtk
-	rm -f /usr/share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
+	rm -f $(DESTDIR)/usr/share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+	rm -f $(DESTDIR)/etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
+	rm -f $(DESTDIR)/usr/libexec/gnome-clock-applet-mechanism
+	rm -f $(DESTDIR)/usr/bin/gnome-clock-applet-mechanism-gtk
+	rm -f $(DESTDIR)/usr/share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
 
 test:
 	 dbus-send --system --print-reply --dest=org.gnome.ClockApplet.Mechanism / org.freedesktop.DBus.Introspectable.Introspect


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore	18 Sep 2007 16:47:30 -0000	1.61
+++ .cvsignore	5 Oct 2007 14:40:26 -0000	1.62
@@ -1 +1,2 @@
-gnome-panel-2.20.0.1.tar.bz2
+intlclock-1.0.tar.gz
+timezone.tar.gz


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- gnome-panel.spec	3 Oct 2007 22:23:44 -0000	1.225
+++ gnome-panel.spec	5 Oct 2007 14:40:26 -0000	1.226
@@ -22,13 +22,21 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.20.0.1
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
-Source1: redhat-panel-default-setup.entries
-Source2: gnome-compiler-flags.m4
-Source3: redhat-panel-backwards-compat-config.schemas
-Source4: add-translations.sh
+# we are upstream for this
+Source1: timezone.tar.gz
+# Novell intlclock, I don't think this has a canonical upstream location
+Source2: intlclock-1.0.tar.gz
+Patch98: timezone-changes.patch
+Patch99: intlclock-changes-20071005.patch
+Patch100: dont-build-clock.patch
+
+Source3: redhat-panel-default-setup.entries
+Source4: gnome-compiler-flags.m4
+Source5: redhat-panel-backwards-compat-config.schemas
+Source6: add-translations.sh
 License: GPLv2+ and LGPLv2+ and GFDL+
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +47,7 @@
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
 %endif
+Requires: PolicyKit-gnome
 
 Requires(post): GConf2 >= %{gconf_version}
 Requires(post): scrollkeeper
@@ -79,6 +88,7 @@
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
+BuildRequires: PolicyKit-devel
 
 Patch0: gnome-panel-2.19.5-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -126,6 +136,15 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+tar xzf %{SOURCE1}
+pushd timezone
+%patch98 -p1 -b .timezone-changes
+popd
+
+tar xzf %{SOURCE2}
+pushd intlclock-1.0
+%patch99 -p1 -b .intlclock-changes
+popd
 
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
@@ -139,11 +158,13 @@
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 
-. %{SOURCE4}
+%patch100 -p1 -b .dont-build-clock
 
-cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
-cp -f %{SOURCE2} m4
-cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
+. %{SOURCE6}
+
+cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
+cp -f %{SOURCE4} m4
+cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
 
 %build
 # gpm-integration patches Makefile.am and configure.in
@@ -154,7 +175,6 @@
 %configure \
    --disable-gtk-doc \
    --disable-scrollkeeper \
-   --with-clock-time-utility=system-config-date \
 %if %{use_evolution_data_server}
    --enable-eds=yes
 %else
@@ -163,9 +183,31 @@
 
 make
 
+pushd timezone
+make
+popd
+
+pushd intlclock-1.0
+intltoolize --force --copy
+aclocal
+automake --add-missing
+autoheader
+autoconf
+%configure
+make
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
+pushd timezone
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+
+pushd intlclock-1.0
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -295,10 +337,10 @@
 %exclude %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/omf/clock
-%{_datadir}/omf/fish
-%{_datadir}/omf/window-list
-%{_datadir}/omf/workspace-switcher
+%dir %{_datadir}/omf/clock
+%dir %{_datadir}/omf/fish
+%dir %{_datadir}/omf/window-list
+%dir %{_datadir}/omf/workspace-switcher
 %{_datadir}/man/man*/*
 %{_datadir}/applications/gnome-panel.desktop
 %{_bindir}/*
@@ -309,6 +351,17 @@
 # LGPL
 %{_libdir}/*.so.*
 
+# intlclock files
+%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
+%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+%{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
+%{_datadir}/intlclock
+%{_libexecdir}/intlclock-applet
+%{_libexecdir}/gnome-clock-applet-mechanism
+%{_bindir}/gnome-clock-applet-mechanism-gtk
+%{_sysconfdir}/gconf/schemas/intlclock.schemas
+%{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
+
 %files devel
 %defattr(-, root, root)
 %{_libdir}/pkgconfig/*
@@ -317,6 +370,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Oct  5 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-4
+- Replace clock by intlclock
+
 * Wed Oct  3 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0.1-3
 - Make it possible to start s-c-d from the clock menu again (#316921)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-panel/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	18 Sep 2007 16:47:30 -0000	1.61
+++ sources	5 Oct 2007 14:40:26 -0000	1.62
@@ -1 +1,3 @@
 bead455015de6bd86bb7259e6276af9e  gnome-panel-2.20.0.1.tar.bz2
+a9a753a55360e743fa4c9a377e49e21d  intlclock-1.0.tar.gz
+717506485ee954b1d7ac6d2bfb3bb4f9  timezone.tar.gz




More information about the scm-commits mailing list