rpms/gtk2/devel gtk-2.13.0-calendarcomma.patch, NONE, 1.1 gtk2.spec, 1.292, 1.293

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2543

Modified Files:
	gtk2.spec 
Added Files:
	gtk-2.13.0-calendarcomma.patch 
Log Message:
* Thu May  1 2008 Christopher Aillon <caillon at redhat.com> - 2.13.0-2
- Remove trailing comma from the enum so -pedantic compiles work


gtk-2.13.0-calendarcomma.patch:

--- NEW FILE gtk-2.13.0-calendarcomma.patch ---
--- trunk/gtk/gtkcalendar.h	2008/02/27 22:46:48	19670
+++ trunk/gtk/gtkcalendar.h	2008/02/28 05:41:56	19671
@@ -72,7 +72,7 @@
   GTK_CALENDAR_NO_MONTH_CHANGE		= 1 << 2,
   GTK_CALENDAR_SHOW_WEEK_NUMBERS	= 1 << 3,
   GTK_CALENDAR_WEEK_START_MONDAY	= 1 << 4,
-  GTK_CALENDAR_SHOW_DETAILS		= 1 << 5,
+  GTK_CALENDAR_SHOW_DETAILS		= 1 << 5
 } GtkCalendarDisplayOptions;
 
 /**



Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- gtk2.spec	25 Apr 2008 04:34:13 -0000	1.292
+++ gtk2.spec	1 May 2008 23:13:39 -0000	1.293
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.13/gtk+-%{version}.tar.bz2
@@ -37,6 +37,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=521032
 Patch4: filechooser-auth.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=517295
+Patch5: gtk-2.13.0-calendarcomma.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -123,6 +126,7 @@
 %patch2 -p1 -b .workaround
 %patch3 -p1 -b .system-log-crash
 %patch4 -p1 -b .filechooser-auth
+%patch5 -p1 -b .calendarcomma
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -306,6 +310,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu May  1 2008 Christopher Aillon <caillon at redhat.com> - 2.13.0-2
+- Remove trailing comma from the enum so -pedantic compiles work
+
 * Thu Apr 24 2008 Matthias Clasen  <mclasen at redhat.com> - 2.13.0-1
 - Update to 2.13.0