[mingw-glibmm24] Update to 2.31.22 and added -static subpackage

[Erik van Pienbroek]

commit 5880ea5f862190390b0e32a1c7bfa8046507a8f9
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Apr 8 17:21:58 2012 +0200

    Update to 2.31.22 and added -static subpackage
    
    - Update to 2.31.22
    - Added -static subpackage
    - Cleaned up unneeded %global tags
    - Dropped upstreamed patches

 .gitignore                                |    1 +
 glibmm-2.31.2-mingw.patch                 |   29 -----------
 glibmm-2.31.2-wrap-deprecated-calls.patch |   74 -----------------------------
 mingw-glibmm24.spec                       |   50 ++++++++++++++-----
 sources                                   |    2 +-
 5 files changed, 39 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7e32e9..e705d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ glibmm-2.24.1.tar.bz2
 /glibmm-2.28.1.tar.bz2
 /glibmm-2.30.0.tar.xz
 /glibmm-2.31.2.tar.xz
+/glibmm-2.31.22.tar.xz
diff --git a/mingw-glibmm24.spec b/mingw-glibmm24.spec
index c47e8df..a9688c4 100644
--- a/mingw-glibmm24.spec
+++ b/mingw-glibmm24.spec
@@ -1,25 +1,17 @@
 %?mingw_package_header
 
-%global mingw_build_win32 1
-%global mingw_build_win64 1
-
 # first two digits of version
 %define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
 
 Name:           mingw-glibmm24
-Version:        2.31.2
-Release:        5%{?dist}
+Version:        2.31.22
+Release:        1%{?dist}
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glibmm/%{release_version}/glibmm-%{version}.tar.xz
-# upstreamed patch
-# http://git.gnome.org/browse/glibmm/commit/?id=ce45ebe8f61ce55230ef15947612c61c7f283bd2
-Patch0:         glibmm-2.31.2-wrap-deprecated-calls.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=667918
-Patch1:         glibmm-2.31.2-mingw.patch
 
 BuildArch:      noarch
 
@@ -43,6 +35,7 @@ inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
 
+# Win32
 %package -n mingw32-glibmm24
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -52,7 +45,14 @@ library. Highlights include typesafe callbacks, widgets extensible via
 inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
+%package -n mingw32-glibmm24-static
+Summary:        Static cross compiled version of the glibmm library
+Requires:       mingw32-glibmm24 = %{version}-%{release}
+
+%description -n mingw32-glibmm24-static
+Static cross compiled version of the glibmm library.
 
+# Win64
 %package -n mingw64-glibmm24
 Summary:        MinGW Windows C++ interface for GTK2 (a GUI library for X)
 
@@ -62,17 +62,23 @@ library. Highlights include typesafe callbacks, widgets extensible via
 inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
+%package -n mingw64-glibmm24-static
+Summary:        Static cross compiled version of the glibmm library
+Requires:       mingw64-glibmm24 = %{version}-%{release}
+
+%description -n mingw64-glibmm24-static
+Static cross compiled version of the glibmm library.
+
 
 %?mingw_debug_package
 
 
 %prep
 %setup -q -n glibmm-%{version}
-%patch0 -p1 -b .ftbfs
-%patch1 -p0 -b .mingw
+
 
 %build
-%mingw_configure --disable-static
+%mingw_configure --enable-static
 %mingw_make %{?_smp_mflags}
 
 
@@ -89,6 +95,7 @@ rm -r $RPM_BUILD_ROOT%{mingw32_datadir}/devhelp
 rm -r $RPM_BUILD_ROOT%{mingw64_datadir}/devhelp
 
 
+# Win32
 %files -n mingw32-glibmm24
 %doc COPYING COPYING.tools
 %{mingw32_bindir}/libgiomm-2.4-1.dll
@@ -104,6 +111,12 @@ rm -r $RPM_BUILD_ROOT%{mingw64_datadir}/devhelp
 %{mingw32_libdir}/pkgconfig/giomm-2.4.pc
 %{mingw32_libdir}/pkgconfig/glibmm-2.4.pc
 
+%files -n mingw32-glibmm24-static
+%{mingw32_libdir}/libgiomm-2.4.a
+%{mingw32_libdir}/libglibmm-2.4.a
+%{mingw32_libdir}/libglibmm_generate_extra_defs-2.4.a
+
+# Win64
 %files -n mingw64-glibmm24
 %doc COPYING COPYING.tools
 %{mingw64_bindir}/libgiomm-2.4-1.dll
@@ -119,8 +132,19 @@ rm -r $RPM_BUILD_ROOT%{mingw64_datadir}/devhelp
 %{mingw64_libdir}/pkgconfig/giomm-2.4.pc
 %{mingw64_libdir}/pkgconfig/glibmm-2.4.pc
 
+%files -n mingw64-glibmm24-static
+%{mingw64_libdir}/libgiomm-2.4.a
+%{mingw64_libdir}/libglibmm-2.4.a
+%{mingw64_libdir}/libglibmm_generate_extra_defs-2.4.a
+
 
 %changelog
+* Sun Apr  8 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.31.22-1
+- Update to 2.31.22
+- Added -static subpackage
+- Cleaned up unneeded %%global tags
+- Dropped upstreamed patches
+
 * Thu Mar 15 2012 Kalev Lember <kalevlember at gmail.com> - 2.31.2-5
 - Build 64 bit Windows binaries
 
diff --git a/sources b/sources
index dad5b96..a0b14de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91e9ea2eadb883d8f5483c8dd65d1fe8  glibmm-2.31.2.tar.xz
+e20fc9b4648c9ddc97b4216dd6cc1ece  glibmm-2.31.22.tar.xz