X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pango.spec;h=ad8e9d11d7afaa9e94378a616f3c3d82986d3bb6;hb=5469af9;hp=1ce9a6167eba6c386384365385fe3c1388193621;hpb=5932feded2e6f2c04753b4e274ce652cb88e6403;p=packages%2Fpango.git

diff --git a/pango.spec b/pango.spec
index 1ce9a61..ad8e9d1 100644
--- a/pango.spec
+++ b/pango.spec
@@ -3,21 +3,22 @@
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	libthai		# don't build thai-lang module
 %bcond_without	static_libs	# don't build static library
-#
+
 Summary:	System for layout and rendering of internationalized text
 Summary(pl.UTF-8):	System renderowania międzynarodowego tekstu
 Summary(pt_BR.UTF-8):	Sistema para layout e renderização de texto internacionalizado
 Name:		pango
-Version:	1.38.0
+Version:	1.40.12
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/pango/1.38/%{name}-%{version}.tar.xz
-# Source0-md5:	5a358e5afbb6b2e82cf2cb02ca9cce86
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/%{name}-%{version}.tar.xz
+# Source0-md5:	9aae7dd5ecc1c2ade4e6951b85004cee
 URL:		http://www.pango.org/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1:1.9
+# cairo-ft cairo-pdf cairo-png cairo-ps cairo-xlib
 BuildRequires:	cairo-devel >= 1.12.10
 BuildRequires:	cairo-gobject-devel >= 1.12.10
 BuildRequires:	docbook-dtd412-xml
@@ -27,10 +28,10 @@ BuildRequires:	freetype-devel >= 2.1.7
 BuildRequires:	glib2-devel >= 1:2.33.12
 BuildRequires:	gobject-introspection-devel >= 0.9.5
 %if %{with apidocs}
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtk-doc-automake >= 1.8
+BuildRequires:	gtk-doc >= 1.15
+BuildRequires:	gtk-doc-automake >= 1.15
 %endif
-BuildRequires:	harfbuzz-devel >= 0.9.9
+BuildRequires:	harfbuzz-devel >= 1.2.3
 %{?with_libthai:BuildRequires:	libthai-devel >= 0.1.9}
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	perl-base
@@ -40,12 +41,13 @@ BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1.0
+BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xz
 Requires:	cairo >= 1.12.10
 Requires:	fontconfig-libs >= 1:2.10.91
 Requires:	freetype >= 2.1.7
 Requires:	glib2 >= 1:2.33.12
-Requires:	harfbuzz >= 0.9.9
+Requires:	harfbuzz >= 1.2.3
 Obsoletes:	libpango24
 Obsoletes:	pango-modules < 1:1.38.0-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,7 +83,8 @@ Requires:	cairo-devel >= 1.12.10
 Requires:	fontconfig-devel >= 1:2.10.91
 Requires:	freetype-devel >= 2.1.7
 Requires:	glib2-devel >= 1:2.33.12
-Requires:	harfbuzz-devel >= 0.9.9
+Requires:	harfbuzz-devel >= 1.2.3
+%{?with_libthai:Requires:	libthai-devel >= 0.1.9}
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXft-devel >= 2.1.0
 Obsoletes:	libpango24-devel
@@ -129,6 +132,9 @@ Summary:	Pango API documentation
 Summary(pl.UTF-8):	Dokumentacja API pango
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Pango API documentation.
@@ -140,6 +146,9 @@ Dokumentacja API pango.
 Summary:	pango - example programs
 Summary(pl.UTF-8):	pango - przykładowe programy
 Group:		X11/Development/Libraries
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description examples
 pango - example programs.
@@ -161,7 +170,6 @@ pango - przykładowe programy.
 	--disable-silent-rules \
 	--enable-debug=%{?debug:yes}%{!?debug:minimum} \
 	%{__enable_disable apidocs gtk-doc} \
-	--enable-man \
 	%{__enable_disable static_libs static} \
 	--with-html-dir=%{_gtkdocdir}
 
@@ -180,6 +188,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 cp examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.la
+
 %{!?with_apidocs:rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/pango}
 
 %clean
@@ -215,7 +225,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpango-1.0.la
 %{_libdir}/libpangocairo-1.0.la
 %{_libdir}/libpangoft2-1.0.la
-%{_libdir}/libpangoxft-1.0.la
 %{_pkgconfigdir}/pango.pc
 %{_pkgconfigdir}/pangocairo.pc
 %{_pkgconfigdir}/pangoft2.pc