diff --git a/gtkmm24-2.21.1-gtkcalendar.patch b/gtkmm24-2.21.1-gtkcalendar.patch
deleted file mode 100644
index 8b26c77..0000000
--- a/gtkmm24-2.21.1-gtkcalendar.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -up gtkmm-2.21.1/gtk/gtkmm/calendar.cc.gtkcalendar gtkmm-2.21.1/gtk/gtkmm/calendar.cc
---- gtkmm-2.21.1/gtk/gtkmm/calendar.cc.gtkcalendar 2010-06-23 10:13:11.000000000 +0300
-+++ gtkmm-2.21.1/gtk/gtkmm/calendar.cc 2010-07-05 20:33:39.000000000 +0300
-@@ -541,9 +541,9 @@ Calendar::Calendar()
-
- }
-
--int Calendar::select_month(guint month, guint year)
-+void Calendar::select_month(guint month, guint year)
- {
-- return gtk_calendar_select_month(gobj(), month, year);
-+gtk_calendar_select_month(gobj(), month, year);
- }
-
- void Calendar::select_day(guint day)
-@@ -551,14 +551,14 @@ void Calendar::select_day(guint day)
- gtk_calendar_select_day(gobj(), day);
- }
-
--int Calendar::mark_day(guint day)
-+void Calendar::mark_day(guint day)
- {
-- return gtk_calendar_mark_day(gobj(), day);
-+gtk_calendar_mark_day(gobj(), day);
- }
-
--int Calendar::unmark_day(guint day)
-+void Calendar::unmark_day(guint day)
- {
-- return gtk_calendar_unmark_day(gobj(), day);
-+gtk_calendar_unmark_day(gobj(), day);
- }
-
- void Calendar::clear_marks()
-diff -up gtkmm-2.21.1/gtk/gtkmm/calendar.h.gtkcalendar gtkmm-2.21.1/gtk/gtkmm/calendar.h
---- gtkmm-2.21.1/gtk/gtkmm/calendar.h.gtkcalendar 2010-06-23 10:13:11.000000000 +0300
-+++ gtkmm-2.21.1/gtk/gtkmm/calendar.h 2010-07-05 20:33:39.000000000 +0300
-@@ -208,7 +208,7 @@ public:
- * @param year The year the month is in.
- * @return true, always.
- */
-- int select_month(guint month, guint year);
-+ void select_month(guint month, guint year);
-
- /** Selects a day from the current month.
- * @param day The day number between 1 and 31, or 0 to unselect
-@@ -220,13 +220,13 @@ public:
- * @param day The day number to mark between 1 and 31.
- * @return true, always.
- */
-- int mark_day(guint day);
-+ void mark_day(guint day);
-
- /** Removes the visual marker from a particular day.
- * @param day The day number to unmark between 1 and 31.
- * @return true, always.
- */
-- int unmark_day(guint day);
-+ void unmark_day(guint day);
-
- /** Remove all visual markers.
- */
-diff -up gtkmm-2.21.1/gtk/src/calendar.hg.gtkcalendar gtkmm-2.21.1/gtk/src/calendar.hg
---- gtkmm-2.21.1/gtk/src/calendar.hg.gtkcalendar 2010-06-23 09:51:55.000000000 +0300
-+++ gtkmm-2.21.1/gtk/src/calendar.hg 2010-07-05 20:33:39.000000000 +0300
-@@ -59,10 +59,10 @@ class Calendar : public Widget
- public:
- _CTOR_DEFAULT
-
-- _WRAP_METHOD(int select_month(guint month, guint year), gtk_calendar_select_month)
-+ _WRAP_METHOD(void select_month(guint month, guint year), gtk_calendar_select_month)
- _WRAP_METHOD(void select_day(guint day), gtk_calendar_select_day)
-- _WRAP_METHOD(int mark_day(guint day), gtk_calendar_mark_day)
-- _WRAP_METHOD(int unmark_day(guint day), gtk_calendar_unmark_day)
-+ _WRAP_METHOD(void mark_day(guint day), gtk_calendar_mark_day)
-+ _WRAP_METHOD(void unmark_day(guint day), gtk_calendar_unmark_day)
- _WRAP_METHOD(void clear_marks(), gtk_calendar_clear_marks)
-
- _WRAP_METHOD(void display_options(CalendarDisplayOptions flags),
-diff -up gtkmm-2.21.1/gtk/src/gtk_methods.defs.gtkcalendar gtkmm-2.21.1/gtk/src/gtk_methods.defs
---- gtkmm-2.21.1/gtk/src/gtk_methods.defs.gtkcalendar 2010-06-23 09:51:55.000000000 +0300
-+++ gtkmm-2.21.1/gtk/src/gtk_methods.defs 2010-07-05 20:33:39.000000000 +0300
-@@ -5710,7 +5710,7 @@
- (define-method select_month
- (of-object "GtkCalendar")
- (c-name "gtk_calendar_select_month")
-- (return-type "gboolean")
-+ (return-type "none")
- (parameters
- '("guint" "month")
- '("guint" "year")
-@@ -5729,7 +5729,7 @@
- (define-method mark_day
- (of-object "GtkCalendar")
- (c-name "gtk_calendar_mark_day")
-- (return-type "gboolean")
-+ (return-type "none")
- (parameters
- '("guint" "day")
- )
-@@ -5738,7 +5738,7 @@
- (define-method unmark_day
- (of-object "GtkCalendar")
- (c-name "gtk_calendar_unmark_day")
-- (return-type "gboolean")
-+ (return-type "none")
- (parameters
- '("guint" "day")
- )
diff --git a/gtkmm24.spec b/gtkmm24.spec
index eed3fde..04e3c7d 100644
--- a/gtkmm24.spec
+++ b/gtkmm24.spec
@@ -1,6 +1,6 @@
Name: gtkmm24
Version: 2.21.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ interface for GTK2 (a GUI library for X)
@@ -8,8 +8,6 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.gtkmm.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.21/gtkmm-%{version}.tar.bz2
-# Temporary patch to get gtkmm building with gtk2-2.21.3
-Patch0: gtkmm24-2.21.1-gtkcalendar.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glibmm24-devel >= 2.24
@@ -57,7 +55,6 @@ This package contains the full API documentation for %{name}.
%prep
%setup -q -n gtkmm-%{version}
-%patch0 -p1 -b .gtkcalendar
%build
@@ -118,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 14 2010 Kalev Lember - 2.21.7-2
+- Dropped gtkmm24-2.21.1-gtkcalendar.patch
+
* Wed Sep 08 2010 Haïkel Guémar - 2.21.7-1
- Update to upstream 2.21.7