rpms/gnome-libs/devel gnome-libs-1.4.2-dateedit-fix1.patch, NONE, 1.1 gnome-libs.spec, 1.2, 1.3

[Paul Howarth (pghmcfc)]

Author: pghmcfc

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

Modified Files:
	gnome-libs.spec 
Added Files:
	gnome-libs-1.4.2-dateedit-fix1.patch 
Log Message:
Fix GnomeDateEdit time format regression (#230186)

gnome-libs-1.4.2-dateedit-fix1.patch:

--- NEW FILE gnome-libs-1.4.2-dateedit-fix1.patch ---
--- gnome-libs-1.4.2/libgnomeui/gnome-dateedit.c~	2007-02-27 13:18:31.000000000 +0100
+++ gnome-libs-1.4.2/libgnomeui/gnome-dateedit.c	2007-02-27 13:18:31.000000000 +0100
@@ -259,7 +259,7 @@
 		mtm->tm_min  = 0;
 		hit = g_new (hour_info_t, 1);
 
-		strftime (buffer, sizeof (buffer), "%X", mtm);
+		strftime (buffer, sizeof (buffer), "%R", mtm);
 		hit->hour = g_strdup (buffer);
 		hit->gde  = gde;
 
@@ -280,7 +280,7 @@
 
 			mtm->tm_min = j;
 			hit = g_new (hour_info_t, 1);
-			strftime (buffer, sizeof (buffer), "%X", mtm);
+			strftime (buffer, sizeof (buffer), "%R", mtm);
 			hit->hour = g_strdup (buffer);
 			hit->gde  = gde;
 
@@ -397,7 +397,7 @@
 	gtk_entry_set_text (GTK_ENTRY (gde->date_entry), buffer);
 
 	/* Set the time */
-	strftime (buffer, sizeof (buffer), "%X", mytm);
+	strftime (buffer, sizeof (buffer), "%T", mytm);
 	gtk_entry_set_text (GTK_ENTRY (gde->time_entry), buffer);
 }
 
@@ -575,8 +575,7 @@
 	/* FIXME: Is this the correct behaviour for an invalid date? */
 	if (!g_date_valid (date))
 	{
-		/* Shrug. Will today do? */
-		g_date_set_time (date, time (NULL));
+		return (time_t)-1;
 	}
 
 	tm.tm_mon = g_date_month (date); 


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-libs/devel/gnome-libs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-libs.spec	13 Feb 2007 12:36:51 -0000	1.2
+++ gnome-libs.spec	9 Mar 2007 13:39:47 -0000	1.3
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPL
 Group:          System Environment/Libraries
@@ -64,6 +64,7 @@
 
 # Fedora patches
 Patch100:       gnome-libs-1.4.2-multilib.patch
+Patch101:       gnome-libs-1.4.2-dateedit-fix1.patch
 
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI
@@ -124,6 +125,7 @@
 cd -
 
 %patch100 -p1 -b .multilib
+%patch101 -p1 -b .dateedit-fix1
 
 %build
 
@@ -261,6 +263,9 @@
 %{_datadir}/emacs/site-lisp/gnome-doc.el
 
 %changelog
+* Fri Mar  9 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-5
+- Fix GnomeDateEdit time format regression (#230186)
+
 * Tue Feb 13 2007 Paul Howarth <paul at city-fan.org> 1:1.4.2-4
 - Fix multilib conflict in /etc/mime-magic.dat (#228361)