X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-glibmm.git;a=blobdiff_plain;f=crossmingw32-glibmm.spec;h=6b749cdc21865468f885d714b3db2b70cc796341;hp=e4d6678497ee5a984d97d9b940845e54ab12f0f0;hb=85f6f607940aa3aa7213bb361794a7364016b89e;hpb=32a5567a39ae37309bd531def786c2e2a7f7e436

diff --git a/crossmingw32-glibmm.spec b/crossmingw32-glibmm.spec
index e4d6678..6b749cd 100644
--- a/crossmingw32-glibmm.spec
+++ b/crossmingw32-glibmm.spec
@@ -1,24 +1,25 @@
-Summary:	A C++ interface for glib library - cross Mingw32 version
-Summary(pl.UTF-8):	Interfejs C++ dla biblioteki glib - wersja skrośna Mingw32
+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.14.2
+Version:	2.28.1
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.14/%{realname}-%{version}.tar.bz2
-# Source0-md5:	58b4fdc97738795a19b1f5ad37f186b4
-URL:		http://gtkmm.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.28/%{realname}-%{version}.tar.bz2
+# Source0-md5:	b5ec0d60558c92098da0bdab389aae94
+URL:		http://www.gtkmm.org/
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	crossmingw32-gcc-c++
-BuildRequires:	crossmingw32-glib2 >= 2.14.0
-BuildRequires:	crossmingw32-libsigc++ >= 2.0.17
+BuildRequires:	crossmingw32-glib2 >= 2.28.0
+BuildRequires:	crossmingw32-libsigc++ >= 2.2.0
 BuildRequires:	libtool >= 2:1.5
-BuildRequires:	perl-XML-Parser
+BuildRequires:	m4
+BuildRequires:	mm-common >= 0.9.5
 BuildRequires:	pkgconfig >= 1:0.15
-Requires:	crossmingw32-glib2 >= 2.14.0
-Requires:	crossmingw32-libsigc++ >= 2.0.17
+Requires:	crossmingw32-glib2 >= 2.28.0
+Requires:	crossmingw32-libsigc++ >= 2.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
@@ -34,30 +35,37 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
 
+%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
+%define		filterout_ld	-Wl,-z,.*
+
 %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.14.0
-Requires:	crossmingw32-libsigc++-dll >= 2.0.17
+Requires:	crossmingw32-glib2-dll >= 2.28.0
+Requires:	crossmingw32-libsigc++-dll >= 2.2.0
 Requires:	wine
 
 %description dll
@@ -72,7 +80,7 @@ Biblioteka DLL glibmm dla Windows.
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
 %{__libtoolize}
-%{__aclocal} -I scripts
+%{__aclocal} -I build
 %{__autoconf}
 %{__automake}
 %configure \
@@ -97,32 +105,40 @@ 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 \
+	$RPM_BUILD_ROOT%{_datadir}/aclocal
 
 %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}/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