packages: pango/pango-arch_confdir.patch, pango/pango.spec - merged from DEVEL

[wiget]

Author: wiget                        Date: Wed Sep 28 18:52:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/pango:
   pango-arch_confdir.patch (1.5 -> 1.6) , pango.spec (1.229 -> 1.230) 

---- Diffs:

================================================================
Index: packages/pango/pango-arch_confdir.patch
diff -u packages/pango/pango-arch_confdir.patch:1.5 packages/pango/pango-arch_confdir.patch:1.6
--- packages/pango/pango-arch_confdir.patch:1.5	Sun Aug 26 21:32:14 2007
+++ packages/pango/pango-arch_confdir.patch	Wed Sep 28 20:52:08 2011
@@ -43,15 +43,15 @@
  
 --- pango-1.16.2.orig/pango/pango-utils.c	2007-04-12 23:54:03.899351741 +0200
 +++ pango-1.16.2/pango/pango-utils.c	2007-04-12 23:54:27.631054049 +0200
-@@ -690,7 +690,7 @@
- 
-   return result;
- #else
--  return SYSCONFDIR "/pango";
-+  return SYSCONFDIR;
+@@ -706,7 +706,7 @@
+       if (sysconfdir != NULL)
+ 	result = g_build_filename (sysconfdir, "pango", NULL);
+       else
+-	result = SYSCONFDIR "/pango";
++	result = SYSCONFDIR;
  #endif
- }
- 
+     }
+   return result;
 --- pango-1.16.2.orig/pango/pangox-fontmap.c	2007-04-12 23:54:04.026009703 +0200
 +++ pango-1.16.2/pango/pangox-fontmap.c	2007-04-12 23:54:27.634387153 +0200
 @@ -921,7 +921,7 @@

================================================================
Index: packages/pango/pango.spec
diff -u packages/pango/pango.spec:1.229 packages/pango/pango.spec:1.230
--- packages/pango/pango.spec:1.229	Wed Apr 20 17:47:11 2011
+++ packages/pango/pango.spec	Wed Sep 28 20:52:08 2011
@@ -9,13 +9,13 @@
 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.28.4
+Version:	1.29.4
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/%{name}-%{version}.tar.bz2
-# Source0-md5:	3f3989700f04e9117d30544a9078b3a0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/pango/1.29/%{name}-%{version}.tar.xz
+# Source0-md5:	9d5aba73897d2e8e8115b3f4fddbc0af
 Patch0:		%{name}-xfonts.patch
 Patch1:		%{name}-arch_confdir.patch
 URL:		http://www.pango.org/
@@ -38,8 +38,10 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python-modules
 BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1.0
+BuildRequires:	xz
 Requires:	cairo >= 1.7.6
 Requires:	freetype >= 2.1.7
 Requires:	glib2 >= 1:2.24.0
@@ -331,6 +333,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.230  2011/09/28 18:52:08  wiget
+- merged from DEVEL
+
+Revision 1.229.2.2  2011/09/28 18:46:35  wiget
+- up to 1.29.4
+
+Revision 1.229.2.1  2011/07/11 10:04:13  patrys
+- 1.29.3
+
 Revision 1.229  2011/04/20 15:47:11  qboosh
 - comment for libstdc++ dependency
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pango/pango-arch_confdir.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pango/pango.spec?r1=1.229&r2=1.230&f=u