rpms/gnome-libs/FC-6 gnome-libs-1.4.2-dateedit-fix1.patch, NONE, 1.1 gnome-libs-1.4.2-multilib.patch, NONE, 1.1 gnome-libs.spec, 1.1, 1.2

[Paul Howarth (pghmcfc)]

Author: pghmcfc

Update of /cvs/extras/rpms/gnome-libs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17045

Modified Files:
	gnome-libs.spec 
Added Files:
	gnome-libs-1.4.2-dateedit-fix1.patch 
	gnome-libs-1.4.2-multilib.patch 
Log Message:
Resync with devel

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); 

gnome-libs-1.4.2-multilib.patch:

--- NEW FILE gnome-libs-1.4.2-multilib.patch ---
--- gnome-libs-1.4.2/libgnome/gnome-magic.c	2000-03-06 16:37:04.000000000 +0000
+++ gnome-libs-1.4.2/libgnome/gnome-magic.c	2007-02-13 11:36:18.000000000 +0000
@@ -188,6 +188,7 @@
 
   while(fgets(aline, sizeof(aline), infile)) {
     curpos = aline;
+    memset(&newent, 0, sizeof(newent));
 
     while(*curpos && isspace(*curpos)) curpos++; /* eat the head */
     if(!isdigit(*curpos)) continue;


Index: gnome-libs.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-libs/FC-6/gnome-libs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-libs.spec	14 Sep 2006 06:23:10 -0000	1.1
+++ gnome-libs.spec	9 Mar 2007 14:16:13 -0000	1.2
@@ -5,7 +5,7 @@
 Name:           gnome-libs
 Epoch:          1
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        The main GNOME1 libraries
 License:        LGPL
 Group:          System Environment/Libraries
@@ -62,6 +62,10 @@
 Patch81:        db.1.85.s390.patch
 Patch82:        db.1.85.nodebug.patch
 
+# 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
 applications and desktop tools to be used in conjunction with a window manager
@@ -120,6 +124,9 @@
 %patch82 -p1 -b .nodebug
 cd -
 
+%patch100 -p1 -b .multilib
+%patch101 -p1 -b .dateedit-fix1
+
 %build
 
 ## db1
@@ -212,7 +219,7 @@
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README %{dbdir}/LICENSE %{dbdir}/changelog
 %{_bindir}/db1_dump185
 %{_bindir}/dns-helper
@@ -242,7 +249,7 @@
 %config %{_sysconfdir}/sound/events/*.soundlist
 
 %files devel
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
 %{_bindir}/gnome-config
 %{_bindir}/libart-config
 %{_bindir}/gnome-doc
@@ -256,6 +263,12 @@
 %{_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)
+
 * Wed Sep 13 2006 Paul Howarth <paul at city-fan.org> 1:1.4.2-3
 - Add full URLs or CVS information for source files
 - Remove conflicts for ancient glibc versions