X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-glibmm.git;a=blobdiff_plain;f=crossmingw32-glibmm.spec;h=420e7627a7fd054e148816aed77a7e9534faf714;hp=3f89947fbd1e805c628b9666df6638837f07376e;hb=de0bc54559bc01345f60bc2e50542fd87f1a6356;hpb=fb1d9018e455b187d15b2be05fb04fb1f0eaba8f

diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index 3f89947..420e762 100644
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -1,63 +1,77 @@
-Summary:	A C++ interface for glib library - cross Mingw32 version
-Summary(pl.UTF-8):	Interfejs C++ dla biblioteki glib - wersja skrośna Mingw32
-%define		_realname	glibmm
-Name:		crossmingw32-%{_realname}
-Version:	2.12.8
-Release:	1
-License:	LGPL
+Summary:	A C++ interface for glib library - cross MinGW32 version
+Summary(pl.UTF-8):	Interfejs C++ dla biblioteki glib - wersja skrośna MinGW32
+%define		realname	glibmm
+Name:		crossmingw32-%{realname}
+Version:	2.36.0
+Release:	2
+License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/%{_realname}-%{version}.tar.bz2
-# Source0-md5:	e2a596f484cd5e328e568f6035efb8d2
-URL:		http://gtkmm.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.36/%{realname}-%{version}.tar.xz
+# Source0-md5:	6f8484ae440e6b2d027a2cf9a3bb7591
+Patch0:		glibmm-win32.patch
+URL:		http://www.gtkmm.org/
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-gcc-c++
-BuildRequires:	crossmingw32-glib2 >= 2.12.9
-BuildRequires:	crossmingw32-libsigc++ >= 2.0.17
-BuildRequires:	pkgconfig
-BuildRequires:	libtool >= 2:1.5
-BuildRequires:	perl-XML-Parser
-Requires:	crossmingw32-glib2 >= 2.12.9
-Requires:	crossmingw32-libsigc++ >= 2.0.17
+BuildRequires:	crossmingw32-glib2 >= 2.36.1
+BuildRequires:	crossmingw32-libsigc++ >= 2.2.10
+BuildRequires:	libtool >= 2:2.0
+BuildRequires:	m4
+BuildRequires:	mm-common >= 0.9.6
+BuildRequires:	pkgconfig >= 1:0.15
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	crossmingw32-glib2 >= 2.36.1
+Requires:	crossmingw32-libsigc++ >= 2.2.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
-%define		arch			%{_prefix}/%{target}
 
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
+%define		_libdir			%{_prefix}/lib
 %define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
+
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
+%define		optflags	-O2
+%endif
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define		filterout_ld	-Wl,-z,.*
+%define		filterout_c	-f[-a-z0-9=]*
+%define		filterout_cxx	-f[-a-z0-9=]*
 
 %description
-A C++ interface for glib library - cross Mingw32 version.
+A C++ interface for glib library - cross MinGW32 version.
 
 %description -l pl.UTF-8
-Interfejs C++ dla biblioteki glib - wersja skrośna Mingw32.
+Interfejs C++ dla biblioteki glib - wersja skrośna MinGW32.
 
 %package static
-Summary:	Static glibmm library (cross mingw32 version)
-Summary(pl.UTF-8):	Statyczna biblioteka glibmm (wersja skrośna mingw32)
+Summary:	Static glibmm library (cross MinGW32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka glibmm (wersja skrośna MinGW32)
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description static
-Static glibmm library (cross mingw32 version).
+Static glibmm library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka glibmm (wersja skrośna mingw32).
+Statyczna biblioteka glibmm (wersja skrośna MinGW32).
 
 %package dll
 Summary:	DLL glibmm library for Windows
 Summary(pl.UTF-8):	Biblioteka DLL glibmm dla Windows
 Group:		Applications/Emulators
-Requires:	crossmingw32-glib2-dll >= 2.12.9
-Requires:	crossmingw32-libsigc++-dll >= 2.0.17
+Requires:	crossmingw32-glib2-dll >= 2.36.1
+Requires:	crossmingw32-libsigc++-dll >= 2.2.10
 Requires:	wine
 
 %description dll
@@ -67,12 +81,13 @@ DLL glibmm library for Windows.
 Biblioteka DLL glibmm dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
+%patch0 -p1
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
-%{__aclocal} -I scripts
+%{__aclocal} -I build
 %{__autoconf}
 %{__automake}
 %configure \
@@ -97,32 +112,39 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{doc,devhelp}
 # use these from native glibmm if needed
-rm -rf $RPM_BUILD_ROOT%{_libdir}/glibmm-2.4/proc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/glibmm-2.4/proc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog CHANGES NEWS README
+%doc AUTHORS ChangeLog NEWS README
+%{_libdir}/libgiomm-2.4.dll.a
 %{_libdir}/libglibmm-2.4.dll.a
 %{_libdir}/libglibmm_generate_extra_defs-2.4.dll.a
+%{_libdir}/libgiomm-2.4.la
 %{_libdir}/libglibmm-2.4.la
 %{_libdir}/libglibmm_generate_extra_defs-2.4.la
-%dir %{_libdir}/%{_realname}-2.4
-%{_libdir}/%{_realname}-2.4/include
-%{_includedir}/%{_realname}-2.4
+%dir %{_libdir}/giomm-2.4
+%{_libdir}/giomm-2.4/include
+%dir %{_libdir}/glibmm-2.4
+%{_libdir}/glibmm-2.4/include
+%{_includedir}/giomm-2.4
+%{_includedir}/glibmm-2.4
+%{_pkgconfigdir}/giomm-2.4.pc
 %{_pkgconfigdir}/glibmm-2.4.pc
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/libgiomm-2.4.a
 %{_libdir}/libglibmm-2.4.a
 %{_libdir}/libglibmm_generate_extra_defs-2.4.a
 
 %files dll
 %defattr(644,root,root,755)
+%{_dlldir}/libgiomm-2.4-*.dll
 %{_dlldir}/libglibmm-2.4-*.dll
 %{_dlldir}/libglibmm_generate_extra_defs-2.4-*.dll