X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-pangomm.git;a=blobdiff_plain;f=crossmingw32-pangomm.spec;h=eaa8aaef0edc27d5116f436cf82cf62bbf30a7dc;hp=40ce3a7efade043579d0e9d0c834aba1c0a290ef;hb=HEAD;hpb=b5bb76277fcf3e476ad661dc7b8f5b4b26ff1d1b

diff --git a/crossmingw32-pangomm.spec b/crossmingw32-pangomm.spec
index 40ce3a7..e647c7d 100644
--- a/crossmingw32-pangomm.spec
+++ b/crossmingw32-pangomm.spec
@@ -1,29 +1,37 @@
-Summary:	A C++ interface for pango library - cross Mingw32 version
-Summary(pl.UTF-8):	Interfejs C++ dla biblioteki pango - wersja skrośna Mingw32
+Summary:	A C++ interface for pango library - cross MinGW32 version
+Summary(pl.UTF-8):	Interfejs C++ dla biblioteki pango - wersja skrośna MinGW32
 Name:		crossmingw32-pangomm
-Version:	2.24.0
+Version:	2.46.4
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.24/pangomm-%{version}.tar.bz2
-# Source0-md5:	fa0f44c37499433455857becad4bbcda
-URL:		http://www.gtkmm.org/
+Source0:	https://download.gnome.org/sources/pangomm/2.46/pangomm-%{version}.tar.xz
+# Source0-md5:	5947d35899db62813531d7ea8faee60c
+URL:		https://www.gtkmm.org/
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
-BuildRequires:	crossmingw32-cairomm >= 1.6.3
-BuildRequires:	crossmingw32-gcc-c++
-BuildRequires:	crossmingw32-glibmm >= 2.16.0
-BuildRequires:	crossmingw32-pango >= 1.24.0
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	crossmingw32-cairomm >= 1.12.0
+BuildRequires:	crossmingw32-gcc-c++ >= 1:4.7
+BuildRequires:	crossmingw32-glibmm >= 2.48.0
+BuildRequires:	crossmingw32-pango >= 1.45.1
+# for gmmproc tools
+BuildRequires:	glibmm-devel >= 2.46.2
+BuildRequires:	libtool >= 2:2.0
+BuildRequires:	mm-common >= 0.9.10
 BuildRequires:	pkgconfig >= 1:0.15
-Requires:	crossmingw32-cairomm >= 1.6.3
-Requires:	crossmingw32-glibmm >= 2.16.0
-Requires:	crossmingw32-pango >= 1.24.0
+BuildRequires:	rpmbuild(macros) >= 1.446
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	crossmingw32-cairomm >= 1.12.0
+Requires:	crossmingw32-gcc-c++ >= 1:4.7
+Requires:	crossmingw32-glibmm >= 2.48.0
+Requires:	crossmingw32-pango >= 1.45.1
 Provides:	crossmingw32-gtkmm-pango
-Obsoletes:	crossmingw32-gtkmm-pango
+Obsoletes:	crossmingw32-gtkmm-pango < 2.14
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
+%define		_enable_debug_packages	0
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
@@ -35,44 +43,48 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
+%define		__pkgconfig_requires	%{nil}
 
+%define		_ssp_cflags		%{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
+# -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=]*
 
 %description
-A C++ interface for pango library - cross Mingw32 version.
+A C++ interface for pango library - cross MinGW32 version.
 
 %description -l pl.UTF-8
-Interfejs C++ dla biblioteki pango - wersja skrośna Mingw32.
+Interfejs C++ dla biblioteki pango - wersja skrośna MinGW32.
 
 %package static
-Summary:	Static pangomm library (cross mingw32 version)
-Summary(pl.UTF-8):	Statyczna biblioteka pangomm (wersja skrośna mingw32)
+Summary:	Static pangomm library (cross MinGW32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka pangomm (wersja skrośna MinGW32)
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Provides:	crossmingw32-gtkmm-pango-static
-Obsoletes:	crossmingw32-gtkmm-pango-static
+Obsoletes:	crossmingw32-gtkmm-pango-static < 2.14
 
 %description static
-Static pangomm library (cross mingw32 version).
+Static pangomm library (cross MinGW32 version).
 
 %description static -l pl.UTF-8
-Statyczna biblioteka pangomm (wersja skrośna mingw32).
+Statyczna biblioteka pangomm (wersja skrośna MinGW32).
 
 %package dll
 Summary:	DLL pangomm library for Windows
 Summary(pl.UTF-8):	Biblioteka DLL pangomm dla Windows
 Group:		Applications/Emulators
-Requires:	crossmingw32-cairomm-dll >= 1.6.3
-Requires:	crossmingw32-glibmm-dll >= 2.16.0
-Requires:	crossmingw32-pango-dll >= 1.24.0
+Requires:	crossmingw32-cairomm-dll >= 1.12.0
+Requires:	crossmingw32-glibmm-dll >= 2.48.0
+Requires:	crossmingw32-pango-dll >= 1.45.1
 Requires:	wine
 Provides:	crossmingw32-gtkmm-pango-dll
-Obsoletes:	crossmingw32-gtkmm-pango-dll
+Obsoletes:	crossmingw32-gtkmm-pango-dll < 2.14
 
 %description dll
 DLL pangomm library for Windows.
@@ -84,19 +96,28 @@ Biblioteka DLL pangomm dla Windows.
 %setup -q -n pangomm-%{version}
 
 %build
-export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
+# use host gmmprocdir (before changing PKG_CONFIG_LIBDIR to cross target)
+# note: rpm.org sets PKG_CONFIG_PATH according to _libdir and _datadir
+GMMPROC_DIR=$(PKG_CONFIG_PATH=%{_sysprefix}/%{_lib}/pkgconfig pkg-config --variable=gmmprocdir glibmm-2.4)
+export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig:%{_npkgconfigdir}
+mm-common-prepare --copy --force
 %{__libtoolize}
-%{__aclocal} -I scripts
+%{__aclocal} -I build
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# std-threads required by glibmm requires at least WinXP API
+CPPFLAGS="%{rpmcppflags} -DWINVER=0x0501"
 %configure \
 	--target=%{target} \
 	--host=%{target} \
-	--disable-docs \
+	--disable-documentation \
+	--enable-maintainer-mode \
+	--disable-silent-rules \
 	--enable-static
 
-%{__make}
+%{__make} \
+	GMMPROC_DIR="$GMMPROC_DIR"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -105,7 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpangomm-*.la
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
@@ -117,9 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc ChangeLog NEWS README.md
 %{_libdir}/libpangomm-1.4.dll.a
-%{_libdir}/libpangomm-1.4.la
 %{_libdir}/pangomm-1.4
 %{_includedir}/pangomm-1.4
 %{_pkgconfigdir}/pangomm-1.4.pc
@@ -130,4 +152,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpangomm-1.4-*.dll
+%{_dlldir}/libpangomm-1.4-1.dll