- Remove trailing comma from the enum so -pedantic compiles work

gtk-2.13.0-calendarcomma.patch

@@ -0,0 +1,12 @@
+--- 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;
+ 
+ /**
+

gtk2.spec

@@ -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 @@ Patch3: system-log-crash.patch
 # 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 @@ docs for the GTK+ widget toolkit.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu May  1 2008 Christopher Aillon <caillon@redhat.com> - 2.13.0-2
+- Remove trailing comma from the enum so -pedantic compiles work
+
 * Thu Apr 24 2008 Matthias Clasen  <mclasen@redhat.com> - 2.13.0-1
 - Update to 2.13.0