From b60499a1ed823ba2a1eb6e396bcd07259ab0a3e0d6fc1e9eb9723715cb8d4980 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 7 Aug 2010 09:37:03 +0000 Subject: [PATCH] Accepting request 44807 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/pango via accept of submit request 44807 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44807 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pango?expand=0&rev=53 --- pango.changes | 10 ++++++++++ pango.spec | 24 ++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pango.changes b/pango.changes index fe61d68..afc6b20 100644 --- a/pango.changes +++ b/pango.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Aug 7 11:29:06 CEST 2010 - vuntz@opensuse.org + +- Update BuildRequires to use the pkgconfig() style: use cairo, + fontconfig, freetype2, gobject-2.0, gobject-introspection-1.0, + libthai, xft, xrender instead of old-style BuildRequires + (cairo-devel, glib2-devel, gobject-introspection-devel, + libthai-devel) +- Remove check for old versions of openSUSE (11.0 and earlier). + ------------------------------------------------------------------- Mon Jul 5 20:47:45 CEST 2010 - dimstar@opensuse.org diff --git a/pango.spec b/pango.spec index cc1b36c..9624d5d 100644 --- a/pango.spec +++ b/pango.spec @@ -20,14 +20,16 @@ Name: pango BuildRequires: gcc-c++ -BuildRequires: cairo-devel -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: pkg-config -%if %suse_version >= 1100 -BuildRequires: libthai-devel -%endif +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(libthai) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xrender) License: LGPLv2.1+ Group: System/Libraries # bug437293 @@ -59,8 +61,6 @@ Authors: Changwoo Ryu Sivaraj Doddannan -%if %suse_version >= 1100 - %package module-thai-lang License: LGPLv2.1+ Summary: System for Layout and Rendering of Internationalised Text @@ -80,8 +80,6 @@ Authors: Changwoo Ryu Sivaraj Doddannan -%endif - %package devel License: LGPLv2.1+ Requires: %{name} = %{version} cairo-devel fontconfig-devel freetype2-devel glib2-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}') @@ -161,7 +159,6 @@ if [ -x usr/bin/pango-querymodules ] ; then > etc/pango/pango.modules fi %endif -%if %suse_version >= 1100 %post module-thai-lang %if "%_lib" == "lib64" @@ -190,7 +187,6 @@ if [ -x usr/bin/pango-querymodules ] ; then > etc/pango/pango.modules fi %endif -%endif %files %defattr(-,root,root) @@ -206,9 +202,7 @@ fi %dir %{_libdir}/pango/1.6.0 %dir %{_libdir}/pango/1.6.0/modules %{_libdir}/pango/1.6.0/modules/*.so -%if %suse_version >= 1100 %exclude %{_libdir}/pango/1.6.0/modules/pango-thai-lang.so -%endif %{_libdir}/lib*.so.* %{_libdir}/girepository-1.0/*.typelib %{_datadir}/gir-1.0/*.gir @@ -220,12 +214,10 @@ fi %else %ghost %{_sysconfdir}/pango/pango.modules %endif -%if %suse_version >= 1100 %files module-thai-lang %defattr(-, root, root) %{_libdir}/pango/1.6.0/modules/pango-thai-lang.so -%endif %files devel %defattr(-, root, root)