SPECS: pango.spec - merged from DEVEL

arekm arekm at pld-linux.org
Tue Aug 30 20:16:53 CEST 2005 

Author: arekm                        Date: Tue Aug 30 18:16:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   pango.spec (1.125 -> 1.126) 

---- Diffs:

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.125 SPECS/pango.spec:1.126
--- SPECS/pango.spec:1.125	Wed Jul 27 19:31:21 2005
+++ SPECS/pango.spec	Tue Aug 30 20:16:47 2005
@@ -7,24 +7,25 @@
 Summary(pl):	System renderowania międzynarodowego tekstu
 Summary(pt_BR):	Sistema para layout e renderizaçăo de texto internacionalizado
 Name:		pango
-Version:	1.8.2
+Version:	1.10.0
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/gnome/sources/pango/1.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	f5b5da7a173f0566d8217ec112fde993
+Source0:	ftp://ftp.gtk.org/pub/gtk/v2.8/%{name}-%{version}.tar.bz2
+# Source0-md5:	c75489ec7f5fe77e31e4cbde71ad0c16
 Patch0:		%{name}-xfonts.patch
 Patch1:		%{name}-xlibs.patch
 URL:		http://www.pango.org/
 %{!?with_xlibs:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
+BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	fontconfig-devel >= 1.0.1
 BuildRequires:	freetype-devel >= 2.1.7
-BuildRequires:	glib2-devel >= 1:2.6.0-2
+BuildRequires:	glib2-devel >= 1:2.8.0
 BuildRequires:	gtk-doc >= 1.0
 %{?with_xlibs:BuildRequires:	libX11-devel}
 BuildRequires:	libtool >= 1:1.4.2-9
@@ -33,8 +34,9 @@
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	xft-devel >= 2.1.0
 Requires(post):	/sbin/ldconfig
+Requires:	cairo >= 1.0.0
 Requires:	freetype >= 2.1.7
-Requires:	glib2 >= 1:2.6.0-2
+Requires:	glib2 >= 1:2.8.0
 Obsoletes:	libpango24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,8 +57,9 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 %{!?with_xlibs:Requires:	XFree86-devel}
+Requires:	cairo-devel >= 1.0.0
 Requires:	freetype-devel >= 2.1.7
-Requires:	glib2-devel >= 1:2.6.0-2
+Requires:	glib2-devel >= 1:2.8.0
 Requires:	gtk-doc-common
 %{?with_xlibs:Requires:	libX11-devel}
 Requires:	xft-devel >= 2.1.0
@@ -205,461 +208,38 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.126  2005/08/30 18:16:47  arekm
+- merged from DEVEL
+
 Revision 1.125  2005/07/27 17:31:21  freetz
 - 1.8.2
 
 Revision 1.124  2005/05/23 14:25:39  qboosh
 - gpm-friendly Source0 URL
 
-Revision 1.123  2005/04/12 22:06:26  qboosh
-- /sbin/ldconfig deps for post* -p are autogenerated
-
-Revision 1.122  2005/04/12 19:23:21  freetz
-- reversed ldconfig changes
-
-Revision 1.121  2005/04/11 08:59:38  paladine
-- missing R(postun): /sbin/ldconfig
-
-Revision 1.120  2005/04/10 14:37:24  freetz
-- new style macros, rel.2
-
-Revision 1.119  2005/03/05 19:12:47  aflinta
-- up to version 1.8.1
-
-Revision 1.118  2004/12/25 18:04:56  qboosh
-- automake epoch
-
-Revision 1.117  2004/12/19 09:18:03  aflinta
-- merged from devel
-
-Revision 1.116.2.1  2004/12/17 08:58:21  krzak
-- up to 1.8.0
-
-Revision 1.116  2004/10/26 11:54:05  qboosh
-- use rpmbuild(macros) deps for _gtkdocdir
-
-Revision 1.115  2004/09/13 22:41:57  grzegol
-- merged from DEVEL and updated to 1.6.0
-
-Revision 1.114  2004/08/26 10:28:46  qboosh
-- lower xft deps (2.1.2 is not really needed) to allow using with XFree86
-- release 4
-
-Revision 1.113  2004/08/16 12:06:40  ankry
-- rel. 3
-
-Revision 1.112  2004/08/16 10:04:55  pluto
-- R(post,postun) fixed. (thx Kacper Kornet).
-
-Revision 1.111  2004/08/15 10:47:49  pluto
-- null file's md5 isn't a good idea.
-
-Revision 1.110  2004/08/15 10:44:29  pluto
-- wrr, brain damage, md5 fixed.
-
-Revision 1.109  2004/08/15 10:40:26  pluto
-- release 2 for rebuild.
-
-Revision 1.108  2004/08/15 10:26:12  pluto
-- reverted.
-
-Revision 1.107  2004/08/15 08:36:58  pluto
-- md5.
-
-Revision 1.106  2004/08/15 08:19:15  pluto
-- updated to 1.5.2.
-
-Revision 1.105  2004/08/06 21:08:32  qboosh
-- updated to 1.4.1
-
-Revision 1.104  2004/07/04 23:44:55  jpc
-- add xlibs bcond and patch (now builds on a pure xlibs system)
-
-Revision 1.103.2.7  2004/08/26 12:00:09  grzegol
-- (B)R: xft-devel >= 2.1.0 (merged from HEAD)
-
-Revision 1.103.2.6  2004/08/18 19:36:32  aflinta
-- we need epoch
-
-Revision 1.103.2.5  2004/08/03 12:07:39  grzegol
-- updated to 1.5.2
-
-Revision 1.103.2.4  2004/07/20 21:42:19  grzegol
-- require gtk+2/glib2 2.4.4 instead of 2.5.0 (glib2-2.6 and gtk+2-2.6 won't be
-  ready for GNOME 2.8)
-
-Revision 1.103.2.3  2004/07/20 18:47:32  grzegol
-- updated to 1.5.1
-
-Revision 1.103.2.2  2004/07/14 21:11:17  freetz
-- xlibs bcond added
-
-Revision 1.103.2.1  2004/07/01 16:51:23  grzegol
-- updated to 1.5.0
-
-Revision 1.103  2004/04/05 01:31:35  ankry
-- reversed last change: triggers not necessary because of different
-  pango.modules location, rel. down to 1
-
-Revision 1.102  2004/04/05 01:11:52  ankry
-- merge triggers from RA-branch (needed for upgrade from Ra), rel. 2, STBR
-
-Revision 1.101  2004/03/19 09:40:48  qboosh
-- cleanups, fixed glib2 deps, updated ac/am deps
-
-Revision 1.100  2004/03/19 09:05:01  aflinta
-- merged from DEVEL
-
-Revision 1.97.2.10  2004/03/16 21:35:16  aflinta
-- up to version 1.4.0, I suggest to move it to HEAD
-
-Revision 1.97.2.9  2004/03/11 13:09:33  freetz
-- debug ready (stolen from HEAD)
-
-Revision 1.97.2.8  2004/03/09 18:56:34  grzegol
-- updated to 1.3.6
-
-Revision 1.97.2.7  2004/03/04 16:01:56  wiget
-- ignore pango-querymodules failure
-- release 2
-
-Revision 1.97.2.6  2004/03/02 08:33:32  aflinta
-- up to version 1.3.5
-
-Revision 1.97.2.5  2004/02/24 21:06:31  grzegol
-- updated to 1.3.3
-- rebuild man pages (--enable-man)
-- updated BRs and Rs, strict internal deps
-
-Revision 1.97.2.4  2004/01/22 23:36:44  grzegol
-- updated to 1.3.2
-
-Revision 1.97.2.3  2004/01/14 22:19:25  grzegol
-- updated to 1.3.1-20040114 snap
-- regenerate gtkdoc/lt/al/ah/ac/am
-
-Revision 1.97.2.2  2003/12/09 00:00:34  wiget
-- 1.3.1
-
-Revision 1.97.2.1  2003/10/26 18:28:45  wiget
-- updated to 1.3.0
-
-Revision 1.97  2003/08/28 19:04:02  qboosh
-- killed unneeded *.la
-
-Revision 1.96  2003/08/27 20:45:31  grzegol
-- updated to 1.2.5
-- removed outdated indic-xft_module_fix patch
-
-Revision 1.95  2003/08/26 23:56:32  grzegol
-- added indic-xft_module_fix.patch (removes unresolved symbols in
-  pango-indic-xft.so module)
-- rel. 2
-
-Revision 1.94  2003/08/26 21:26:20  aflinta
-- release 1
-
-Revision 1.93  2003/08/26 18:51:40  grzegol
-- updated to 1.2.4-rc1
-
-Revision 1.92  2003/06/10 20:18:05  qboosh
-- autoconf 2.53
-
-Revision 1.91  2003/06/09 18:50:19  qboosh
-- s/Xft-devel/xft-devel/
-
-Revision 1.90  2003/06/09 18:33:20  grzegol
-- updated to 1.2.3
-
-Revision 1.89  2003/05/30 21:36:18  aflinta
-- version 1.2.2
-
-Revision 1.88  2003/05/25 11:00:56  malekith
-- massive attack, adding Source-md5
-
-Revision 1.87  2003/05/25 06:24:32  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.86  2003/05/15 16:12:26  wiget
-- rebuild with new xft
-
-Revision 1.85  2003/02/19 17:50:30  wrobell
-- Xft-devel provides XFree86-xft-devel
-
-Revision 1.84  2003/02/12 20:10:41  aflinta
-- Xft-devel should be enough for everyone ;)
-
-Revision 1.83  2003/02/12 10:22:21  wrobell
-- fixed build and install requirements /for xft from XFree86 4.3/
-- rel. 2
-
-Revision 1.82  2003/02/03 13:38:14  trojan
-- updated to 1.2.1
-
-Revision 1.81  2003/01/27 21:51:25  misiek
-- rel 2
-
-Revision 1.80  2002/12/21 11:00:05  aflinta
-- updated to version 1.2.0 - stable
-
-Revision 1.79  2002/12/18 12:50:17  wrobell
-- removed obsoleted patches
-
-Revision 1.78  2002/12/17 11:46:08  aflinta
-- updated to version 1.1.6
-
-Revision 1.77  2002/12/11 00:45:10  aflinta
-- updated to version 1.1.5
-
-Revision 1.76  2002/12/05 23:53:52  aflinta
-- we need latest Xft
-- release 3
-
-Revision 1.75  2002/12/04 16:10:00  wrobell
-- removed pango-Xft2 patch (not needed with Xft 2.0-5)
-
-Revision 1.74  2002/12/04 14:45:26  aflinta
-- moved from /usr/X11R6 to /usr, _gtkdocdir is now in rpm macros, release 2
-
-Revision 1.73  2002/12/03 20:37:38  grzegol
-- updated to 1.1.4
-
-Revision 1.72  2002/11/25 14:17:48  ankry
-- massive attack: no need for 755 for *.la
-
-Revision 1.71  2002/11/22 13:32:54  mmazur
-- cosmetics
-
-Revision 1.70  2002/11/19 18:45:19  mmazur
-- no need for this workaround since libtool is fixed
-
-Revision 1.69  2002/11/18 16:57:26  mmazur
-- workaround just as in glib2.spec... rel2
-
-Revision 1.68  2002/11/17 19:11:08  mmazur
-- note about building
-
-Revision 1.67  2002/11/05 17:22:09  krzak
-- BuildRequires:  Xft-devel >= 1.1.3
-
-Revision 1.66  2002/11/03 22:38:12  aflinta
-- updated BRs
-- uncoment slighthint patch
-
-Revision 1.65  2002/11/03 16:16:14  misiek
-- updated to 1.1.3
-
-Revision 1.64  2002/10/22 20:32:21  malekith
-- release 3
-
-Revision 1.63  2002/10/16 09:49:07  wiget
-- -devel not R: -modules
-- static modules are useless
-- release 2
-
-Revision 1.62  2002/10/14 07:30:36  qboosh
-- BR: perl, added Requires()
-
-Revision 1.61  2002/10/13 20:42:34  grzegol
-- updated to 1.1.2
-
-Revision 1.60  2002/10/12 00:39:03  malekith
-- fix .pc files not to have -I/usr/include
-- release 2
-
-Revision 1.59  2002/10/10 07:46:49  trojan
-- added BR: gtk-doc >= 0.9-4
-
-Revision 1.58  2002/10/09 13:14:42  kloczek
-- use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
-
-Revision 1.57  2002/10/09 10:21:52  trojan
-- added module subpackage
-
-Revision 1.56  2002/10/06 18:15:33  qboosh
-- added freetype patch to use freetype2 headers, not conflicting freetype 1.x
-
-Revision 1.55  2002/10/04 12:07:09  trojan
-- added patch to compile with Xfs2
-
-Revision 1.54  2002/10/04 11:58:50  trojan
-- added BR: Xfs-devel
-- added R: to devel subpackage
-STBR
-
-Revision 1.53  2002/10/04 07:38:13  trojan
-- updated to 1.1.1
-
-Revision 1.52  2002/09/12 15:11:43  wrobell
-- fixed freetype version requirement
-- rel. 2, stb
-
-Revision 1.51  2002/08/04 05:18:37  kloczek
-- updated to 1.0.4 (bugfix release).
-
-Revision 1.50  2002/07/02 12:45:26  ankry
-- Requires gtk-doc-common for -devel subpackage
-- release 3
-
-Revision 1.49  2002/06/18 14:07:27  blues
-- release 2 - rebuild with new freetype
-- added missing files to static package
-
-Revision 1.48  2002/06/17 09:56:32  wiget
-fix gtk-doc path
-
-Revision 1.47  2002/06/17 09:56:10  wiget
-fix gtk-doc path
-
-Revision 1.46  2002/06/17 09:36:50  wiget
-updated to 1.0.3
-
-Revision 1.45  2002/05/30 13:32:21  kloczek
-- release 2.
-
-Revision 1.44  2002/05/30 13:02:46  qboosh
-- Groups changed to X11/*, new %%doc
-
-Revision 1.43  2002/05/28 06:18:43  kloczek
-- updated to 1.0.2,
-- merge translations from Conectiva,
-- remove avoiding relinking in %install (isn't neccessary now).
-
-Revision 1.42  2002/05/21 23:14:20  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
-             s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
-
-Revision 1.41  2002/04/13 15:55:51  kloczek
-- release 3: BR: glib2-devel >= 2.0.1.
-
-Revision 1.40  2002/04/13 15:53:26  michuz
-- fixed %%files
-
-Revision 1.39  2002/04/13 10:23:29  kloczek
-- updated to 1.0.1.
-
-Revision 1.38  2002/03/24 23:28:23  kloczek
-- perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
-
-Revision 1.37  2002/03/10 12:09:26  kloczek
-- update to final 1.0.0,
-- disable using system avalaible fribidi and use included mini_fribidi.
-
-Revision 1.36  2002/03/07 11:05:46  misiek
-- fixed libs
-
-Revision 1.35  2002/03/07 10:54:47  misiek
-- updated to 1.0.0 rc1
-
-Revision 1.34  2002/03/05 11:33:33  wrobell
-- set umask to 022 in post section so pango.modules has correct attributes
-- rel. 2
-- stb
-
-Revision 1.33  2002/02/23 04:17:26  kloczek
-- adapterized.
-
-Revision 1.32  2002/02/22 23:29:21  kloczek
-- removed all Group fields translations (oure rpm now can handle translating
-  Group field using gettext).
-
-Revision 1.31  2002/02/19 02:25:40  kloczek
-- rebuild against glib2 1.3.14.
-
-Revision 1.30  2002/02/18 23:15:37  misiek
-- updated to 0.25
-
-Revision 1.29  2002/02/05 19:27:09  kloczek
-- release 3.
-
-Revision 1.28  2002/02/05 16:16:26  kloczek
-- release 2: added use_system_fribidi patch for using system avalaible fribidi.
-
-Revision 1.27  2002/02/02 06:16:15  kloczek
-- updated to 0.24 and rebuild against glib2 1.3.13.
-
-Revision 1.26  2002/01/18 02:14:09  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
-
-Revision 1.25  2002/01/13 17:07:12  kloczek
-- release 2: disable using gtk-doc.
-
-Revision 1.24  2002/01/13 11:10:54  misiek
-- updated BR
-
-Revision 1.23  2002/01/12 20:50:26  michuz
-- updated to 0.23
-
-Revision 1.22  2001/11/08 20:02:02  kloczek
-- added fribidi-devel to Requires list in devel subpackage,
-- cosmetics.
-
-Revision 1.21  2001/10/29 17:37:24  misiek
-- sorry but splitting into subpackages was bad idea
-
-Revision 1.20  2001/10/29 17:13:21  misiek
-- finished 0.21 (misiek && wiget)
-
-Revision 1.19  2001/10/28 14:31:12  misiek
-- 0.21; nfy
-
-Revision 1.18  2001/10/07 18:38:11  marcus
-- ac/am 2.5
-
-Revision 1.17  2001/06/13 07:40:44  cieciwa
--release 3,
--fixed pkgconfig file,
--moved pkgconfig file to devel package.
-
-Revision 1.16  2001/06/12 12:06:19  cieciwa
--relesae 2,
--fixed problem with libraries.
-
-Revision 1.15  2001/06/12 10:46:02  cieciwa
--commented unused entry "pango-config".
-
-Revision 1.14  2001/05/09 16:58:32  wiget
-BuildRequires pkgconfig
-
-Revision 1.13  2001/05/07 10:58:21  cieciwa
-- updated to version 0.16
-
-Revision 1.12  2001/01/12 00:35:16  klakier
-- fribidi-devel is not Required too (forgot to remove)
-
-Revision 1.11  2001/01/12 00:09:14  klakier
-- fribidi no loger required
-- source URL changed to gtk site
-
-Revision 1.10  2001/01/11 23:57:08  klakier
-- v 0.13
-
-Revision 1.9  2000/11/12 20:11:55  kloczek
-- modyfications for using neew rpm automation.
+Revision 1.124.2.9  2005/08/17 19:19:37  aflinta
+- require official versions
 
-Revision 1.8  2000/08/29 13:50:38  klakier
-- *.a module files separated to static
-- fixed pango-querymodules invocation in %%post
+Revision 1.124.2.8  2005/08/15 23:15:21  freetz
+- 1.10.0
 
-Revision 1.7  2000/08/28 20:20:58  klakier
-- pango.modules location changed from /var/lib/pango to %{_sysconfdir}/pango
+Revision 1.124.2.7  2005/08/14 15:15:04  freetz
+- 20050814 snap (for cairo with included libpixman)
 
-Revision 1.6  2000/08/24 20:27:26  klakier
-- fixed perms on scripts
+Revision 1.124.2.6  2005/07/26 19:25:58  freetz
+- 1.9.1
 
-Revision 1.5  2000/08/24 18:25:58  klakier
-- split to static
-- fixed devel package
+Revision 1.124.2.5  2005/07/26 14:16:10  freetz
+- require bleeding edge cairo (0.5.3)
 
-Revision 1.4  2000/06/09 07:54:45  kloczek
-- more %%{__make} macros.
+Revision 1.124.2.4  2005/07/23 12:11:30  freetz
+- 20050723 snap (cairo font rendering related changes)
 
-Revision 1.3  2000/06/09 07:23:27  kloczek
-- added using %%{__make} macro.
+Revision 1.124.2.3  2005/07/19 06:52:50  wiget
+- BR/R cairo >= 0.5.1
 
-Revision 1.2  2000/05/04 03:42:53  kloczek
-- fixed lib*.so symlinks.
+Revision 1.124.2.2  2005/07/02 20:32:55  freetz
+- updated BRs/Rs (cairo stuff)
 
-* Fri Feb 11 2000 Owen Taylor <otaylor at redhat.com>
-- Created spec file
+Revision 1.124.2.1  2005/07/02 20:17:49  freetz
+- 1.9.0, changlog cut, use ftp.gtk.org
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pango.spec?r1=1.125&r2=1.126&f=u

More information about the pld-cvs-commit mailing list