From 726a84316a22d73cd38b488f15b85115d89babc182fef7e964c9ccc893f2a26c Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Wed, 4 May 2011 11:59:21 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gtkmm2
 revision 45.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtkmm2?expand=0&rev=bc467131135558bc0da5efd633da72ca
---
 gtkmm2.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtkmm2.spec b/gtkmm2.spec
index e4ae10d..10d7c60 100644
--- a/gtkmm2.spec
+++ b/gtkmm2.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gtkmm2 (Version 2.22.0)
+# spec file for package gtkmm2
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

From fa30210773ab0e4280526f19c8cea3ec9fcc00a55eeb86d2f5c15c6bc472860e Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 9 Jul 2011 18:58:53 +0000
Subject: [PATCH 2/2] Accepting request 75908 from
 home:vuntz:branches:GNOME:Factory

Update to 2.24.2

OBS-URL: https://build.opensuse.org/request/show/75908
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtkmm2?expand=0&rev=65
---
 gtkmm-2.24.0.tar.bz2 |  3 ---
 gtkmm-2.24.2.tar.bz2 |  3 +++
 gtkmm2.changes       | 17 +++++++++++++++++
 gtkmm2.spec          | 10 +++++-----
 4 files changed, 25 insertions(+), 8 deletions(-)
 delete mode 100644 gtkmm-2.24.0.tar.bz2
 create mode 100644 gtkmm-2.24.2.tar.bz2

diff --git a/gtkmm-2.24.0.tar.bz2 b/gtkmm-2.24.0.tar.bz2
deleted file mode 100644
index 5211ae5..0000000
--- a/gtkmm-2.24.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cbae7254746bc7df7cce882d9b9a916c4e00dba7bdacd1c50b5d096a484cf56
-size 15227037
diff --git a/gtkmm-2.24.2.tar.bz2 b/gtkmm-2.24.2.tar.bz2
new file mode 100644
index 0000000..daa7b3e
--- /dev/null
+++ b/gtkmm-2.24.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:771a69c3252d06b20d4e8be4822bd7fa3b58424458733e3526218a128f1fea34
+size 15314652
diff --git a/gtkmm2.changes b/gtkmm2.changes
index 70b3314..6c4a720 100644
--- a/gtkmm2.changes
+++ b/gtkmm2.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Jul  8 16:00:46 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 2.24.2:
+  + Do not require mm-common when building from a tarball
+    (bgo#654231).
+- Changes from version 2.24.1:
+  + Gtk:
+    - ComboBoxText:
+      . Correct the constructors (bgo#650673).
+      . prepend_text(): call prepend() instead of append()
+        (bgo#650673).
+  + Gdk:
+    - Rectangle: Add reference documentation.
+- Remove --disable-documentation from configure as we can have
+  documentation again.
+
 -------------------------------------------------------------------
 Thu Apr 28 11:30:31 CEST 2011 - vuntz@opensuse.org
 
diff --git a/gtkmm2.spec b/gtkmm2.spec
index 10d7c60..ea725ab 100644
--- a/gtkmm2.spec
+++ b/gtkmm2.spec
@@ -22,14 +22,13 @@ Name:           gtkmm2
 %define _name gtkmm
 BuildRequires:  atkmm-devel cairomm-devel fdupes gcc-c++ glibmm2-devel libsigc++2-devel pangomm-devel
 BuildRequires:  gtk2-devel >= 2.15.1
-Version:        2.24.0
+Version:        2.24.2
 Release:        1
-# FIXME: if there is a new upstream version, remove --disable-documentation from configure: this is right now broken because of the move to mm-common upstream, and we need a tarball to have this work.
 Group:          System/Libraries
 License:        LGPLv2.1+
 Summary:        C++ Interface for GTK2 (a GUI Library for X)
 Url:            http://www.gtkmm.org/
-Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gtkmm/2.24/%{_name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -76,8 +75,7 @@ freely combined to quickly create complex user interfaces.
 # FIXME: cannot autoreconf, HAVE_MKFIFO is missing.
 #ACLOCAL="aclocal -I scripts" autoreconf -f -i
 %configure \
-        --disable-static \
-        --disable-documentation
+        --disable-static
 make %{?jobs:-j%jobs} gtkmm_docdir=%{_docdir}/%{name}/docs
 
 %install
@@ -104,5 +102,7 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/gdkmm-2.4/
 %{_libdir}/gtkmm-2.4/
+%doc %{_datadir}/devhelp/books/%{_name}-2.4/
+%doc %{_datadir}/doc/%{_name}-2.4/
 
 %changelog