- updated to 1.30.1

Changed files:
    pango-arch_confdir.patch -> 1.7
    pango.spec -> 1.236

diff --git a/pango-arch_confdir.patch b/pango-arch_confdir.patch
index 66147537ec908d93680c0c9071de88de411bbc64..78062cf9d857ad631ef16c79642197ec31ff3830 100644 (file)
--- a/pango-arch_confdir.patch
+++ b/pango-arch_confdir.patch
@@ -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");
+     {
+-      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 = pango_split_file_list (files_str);
+-      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);
+     }
  

diff --git a/pango.spec b/pango.spec
index f9e044567b2debf0960cf6bd6f0fc92215da292a..78cd39a229d4be03ded8fa139bbeeab9558fefc1 100644 (file)
--- a/pango.spec
+++ b/pango.spec
@@ -8,13 +8,13 @@ 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.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/