- proper shared + static build

Changed files:
    crossmingw32-pango.spec -> 1.2

diff --git a/crossmingw32-pango.spec b/crossmingw32-pango.spec
index 3922640412681a7c689cb1d9f0189af94f72e2d2..32df3cdba6e5d4b2c3ca5ac906cf9411d6b4a514 100644 (file)
--- a/crossmingw32-pango.spec
+++ b/crossmingw32-pango.spec
@@ -5,21 +5,24 @@
 # Conditional build:
 %bcond_with    arch_confdir    # build with arch-dependant config dir
 #
-%define                _realname   pango
 Summary:       System for layout and rendering of internationalized text - cross Mingw32 version
 Summary(pl.UTF-8):System renderowania międzynarodowego tekstu - wersja skrośna dla Mingw32
 Summary(pt_BR.UTF-8):Sistema para layout e renderização de texto internacionalizado
+%define                _realname   pango
 Name:          crossmingw32-%{_realname}
-Version:       1.14.10
+%define                _mainver 1.15
+Version:       %{_mainver}.6
 Release:       1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/pango/1.14/%{_realname}-%{version}.tar.bz2
-# Source0-md5: e9fc2f8168e74e2fa0aa8238ee0e9c06
+Source0:       http://ftp.gnome.org/pub/gnome/sources/pango/%{_mainver}/%{_realname}-%{version}.tar.bz2
+# Source0-md5: b122a41e2ba832a24013c153dd52c982
 Patch0:                %{name}-noexamples.patch
 Patch1:                %{name}-static.patch
 Patch2:                %{_realname}-xfonts.patch
 Patch3:                %{_realname}-arch_confdir.patch
+Patch4:                %{name}-cairo.patch
+Patch5:                %{name}-static_and_dll.patch
 URL:           http://www.pango.org/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake >= 1:1.7
@@ -34,7 +37,6 @@ BuildRequires:        rpmbuild(macros) >= 1.197
 Requires:      crossmingw32-cairo >= 1.2.4
 Requires:      crossmingw32-freetype >= 2.1.7
 Requires:      crossmingw32-glib2 >= 2.12.9
-Obsoletes:     libpango24
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -63,23 +65,27 @@ internacionalizado.
 
 %prep
 %setup -q -n %{_realname}-%{version}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
 %patch2 -p1
 %{?with_arch_confdir:%patch3 -p1}
+%patch4 -p1
+#%patch5 -p1
 
 %build
-export PKG_CONFIG_PATH=%{_prefix}/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkgconfigdir}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-       AR="%{target}-ar" \
-       RANLIB="%{target}-ranlib" \
        --target=%{target} \
-       --host=%{target}
+       --host=%{target} \
+       --with-fribidi \
+       --enable-static
+
+#%{__sed} -i -e 's/^deplibs_check_method=.*/deplibs_check_method="pass_all"/' libtool
 
 %{__make}
 
@@ -93,15 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 #> $RPM_BUILD_ROOT%{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
 
 # useless (modules loaded through libgmodule)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.5.0/modules/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.6.0/modules/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README examples/HELLO.utf8
-%attr(755,root,root) %{_libdir}/lib*.la
-%attr(755,root,root) %{_libdir}/libpango*.a
+%doc AUTHORS NEWS README
+%{_libdir}/lib*.la
+%{_libdir}/libpango*.a
+%{_bindir}/*.dll
 %{_pkgconfigdir}/*
 %{_includedir}/*