packages: pango/pango-arch_confdir.patch, pango/pango.spec - updated to 1.30.1

[kiesiu]

Author: kiesiu                       Date: Mon Jun 11 14:39:56 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.30.1

---- Files affected:
packages/pango:
   pango-arch_confdir.patch (1.6 -> 1.7) , pango.spec (1.235 -> 1.236) 

---- Diffs:

================================================================
Index: packages/pango/pango-arch_confdir.patch
diff -u packages/pango/pango-arch_confdir.patch:1.6 packages/pango/pango-arch_confdir.patch:1.7
--- packages/pango/pango-arch_confdir.patch:1.6	Wed Sep 28 20:52:08 2011
+++ packages/pango/pango-arch_confdir.patch	Mon Jun 11 16:39:51 2012
@@ -1,5 +1,6 @@
---- pango-1.18.0/modules/Makefile.am.orig	2007-07-05 23:30:28.000000000 +0200
-+++ pango-1.18.0/modules/Makefile.am	2007-08-26 20:39:17.982104313 +0200
+diff -uNr pango-1.30.1/modules/Makefile.am pango-1.30.1.new/modules/Makefile.am
+--- pango-1.30.1/modules/Makefile.am	2011-08-16 03:11:08.000000000 +0200
++++ pango-1.30.1.new/modules/Makefile.am	2012-06-11 16:30:03.042700937 +0200
 @@ -28,15 +28,15 @@
  
  install-data-local: $(top_builddir)/pango/pango-querymodules$(EXEEXT)
@@ -30,20 +31,22 @@
  
  pango.modules:						\
  	$(SUBDIRS)					\
---- pango-1.16.2.orig/pango/Makefile.am	2007-04-12 23:54:04.006011079 +0200
-+++ pango-1.16.2/pango/Makefile.am	2007-04-12 23:54:27.631054049 +0200
-@@ -158,7 +158,7 @@
+diff -uNr pango-1.30.1/pango/Makefile.am pango-1.30.1.new/pango/Makefile.am
+--- pango-1.30.1/pango/Makefile.am	2012-04-25 22:10:36.000000000 +0200
++++ pango-1.30.1.new/pango/Makefile.am	2012-06-11 16:30:03.042700937 +0200
+@@ -181,7 +181,7 @@
  if HAVE_X
- pangoinclude_HEADERS += pangox.h
+ pangoinclude_HEADERS += $(pangox_headers)
  lib_LTLIBRARIES += libpangox-1.0.la
 -aliasdir = $(sysconfdir)/pango
 +aliasdir = $(sysconfdir)
  alias_DATA = pangox.aliases
  endif
  
---- 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
-@@ -706,7 +706,7 @@
+diff -uNr pango-1.30.1/pango/pango-utils.c pango-1.30.1.new/pango/pango-utils.c
+--- pango-1.30.1/pango/pango-utils.c	2012-06-02 04:43:05.000000000 +0200
++++ pango-1.30.1.new/pango/pango-utils.c	2012-06-11 16:30:03.046034427 +0200
+@@ -740,7 +740,7 @@
        if (sysconfdir != NULL)
  	result = g_build_filename (sysconfdir, "pango", NULL);
        else
@@ -52,14 +55,18 @@
  #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 @@
-   int n;
+diff -uNr pango-1.30.1/pango/pangox-fontmap.c pango-1.30.1.new/pango/pangox-fontmap.c
+--- pango-1.30.1/pango/pangox-fontmap.c	2012-05-23 04:57:52.000000000 +0200
++++ pango-1.30.1.new/pango/pangox-fontmap.c	2012-06-11 16:33:37.852789261 +0200
+@@ -912,9 +912,9 @@
  
    if (!files_str)
--    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases");
-+    files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases");
- 
-   files = pango_split_file_list (files_str);
+     {
+-      user_file = g_build_filename (g_get_user_config_dir (), "pango", "pangox.aliases", NULL);
++      user_file = g_build_filename (g_get_user_config_dir (), "pangox.aliases", NULL);
+ 
+-      files_str = g_strconcat (user_file, ":" SYSCONFDIR "/pango/pangox.aliases", NULL);
++      files_str = g_strconcat (user_file, ":" SYSCONFDIR "/pangox.aliases", NULL);
+       g_free (user_file);
+     }
  

================================================================
Index: packages/pango/pango.spec
diff -u packages/pango/pango.spec:1.235 packages/pango/pango.spec:1.236
--- packages/pango/pango.spec:1.235	Tue Mar 27 21:15:49 2012
+++ packages/pango/pango.spec	Mon Jun 11 16:39:51 2012
@@ -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.30.0
+Version:	1.30.1
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/pango/1.30/%{name}-%{version}.tar.xz
-# Source0-md5:	2a70627ffd9f43c52c04cc0b05fe359f
+# Source0-md5:	ec3c1f236ee9bd4a982a5f46fcaff7b9
 Patch0:		%{name}-xfonts.patch
 Patch1:		%{name}-arch_confdir.patch
 URL:		http://www.pango.org/
@@ -336,6 +336,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.236  2012/06/11 14:39:51  kiesiu
+- updated to 1.30.1
+
 Revision 1.235  2012/03/27 19:15:49  qboosh
 - require stable version of glib2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/pango/pango-arch_confdir.patch?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/packages/pango/pango.spec?r1=1.235&r2=1.236