upgrading package: pkgconfig 0.25 -> 0.27

pkgconfig/pkgconfig.patch

@@ -1,7 +1,7 @@
 Index: main.c
---- main.c.orig	2010-05-10 19:58:57.000000000 +0200
-+++ main.c	2010-05-24 23:53:14.000000000 +0200
-@@ -184,7 +184,8 @@
+--- main.c.orig	2012-07-11 14:24:23.000000000 +0200
++++ main.c	2012-07-12 08:29:20.000000000 +0200
+@@ -204,7 +204,8 @@
    static int want_I_cflags = 0;
    static int want_other_cflags = 0;
    static int want_list = 0;
@@ -11,18 +11,18 @@ Index: main.c
    static int want_short_errors = 0;
    static int want_uninstalled = 0;
    static char *variable_name = NULL;
-@@ -224,7 +225,9 @@
-     { "libs", 0, POPT_ARG_NONE, &want_libs, 0,
-       "output all linker flags" },
-     { "static", 0, POPT_ARG_NONE, &want_static_lib_list, 0,
--      "output linker flags for static linking" },
-+      "output explicit linker flags for static linking" },
-+    { "shared", 0, POPT_ARG_NONE, &want_shared_lib_list, 0,
-+      "output implicit linker flags for dynamic linking" },
-     { "short-errors", 0, POPT_ARG_NONE, &want_short_errors, 0,
-       "print short errors" },
-     { "libs-only-l", 0, POPT_ARG_NONE, &want_l_libs, 0,
-@@ -391,6 +394,17 @@
+@@ -238,7 +239,9 @@
+     { "libs", 0, 0, G_OPTION_ARG_NONE, &want_libs,
+       "output all linker flags", NULL },
+     { "static", 0, 0, G_OPTION_ARG_NONE, &want_static_lib_list,
+-      "output linker flags for static linking", NULL },
++      "output explicit linker flags for static linking", NULL },
++    { "shared", 0, 0, G_OPTION_ARG_NONE, &want_shared_lib_list,
++      "output implicit linker flags for dynamic linking", NULL },
+     { "short-errors", 0, 0, G_OPTION_ARG_NONE, &want_short_errors,
+       "print short errors", NULL },
+     { "libs-only-l", 0, 0, G_OPTION_ARG_NONE, &want_l_libs,
+@@ -415,6 +418,17 @@
    else
      debug_spew ("Error printing disabled\n");
  
@@ -40,7 +40,7 @@ Index: main.c
    if (want_static_lib_list)
      enable_private_libs();
    else
-@@ -724,7 +738,7 @@
+@@ -740,7 +754,7 @@
  
    if (want_l_libs)
      {
@@ -49,7 +49,7 @@ Index: main.c
        printf ("%s ", str);
        g_free (str);
        need_newline = TRUE;
-@@ -738,14 +752,14 @@
+@@ -754,14 +768,14 @@
      }
    else if (want_other_libs)
      {
@@ -66,33 +66,10 @@ Index: main.c
        printf ("%s ", str);
        g_free (str);
        need_newline = TRUE;
-Index: parse.c
---- parse.c.orig	2010-05-23 22:51:16.000000000 +0200
-+++ parse.c	2010-05-24 09:22:31.000000000 +0200
-@@ -1447,7 +1447,7 @@
- 
-       return pkg;
-     }
--  else
-+  else if (strncmp (name, "gnome", strlen("gnome")) == 0)
-     {
-       /* Check for the module in gnome-config */
-       char *output;
-@@ -1546,5 +1546,10 @@
- 
-       return pkg;
-     }
-+  else
-+    {
-+      g_free (pkg);
-+      return NULL;
-+    }
- #endif
- }
 Index: pkg.c
---- pkg.c.orig	2010-05-08 22:14:17.000000000 +0200
-+++ pkg.c	2010-05-24 09:22:31.000000000 +0200
-@@ -471,6 +471,58 @@
+--- pkg.c.orig	2012-05-30 14:49:24.000000000 +0200
++++ pkg.c	2012-07-12 08:27:29.000000000 +0200
+@@ -439,6 +439,58 @@
    return nodups;
  }
  
@@ -151,7 +128,7 @@ Index: pkg.c
  static char *
  string_list_to_string (GSList *list)
  {
-@@ -1013,6 +1065,28 @@
+@@ -974,6 +1026,28 @@
  }
  
  static char*
@@ -180,7 +157,7 @@ Index: pkg.c
  get_multi_merged (GSList *pkgs, GetListFunc func, gboolean in_path_order,
  		  gboolean include_private)
  {
-@@ -1056,13 +1130,39 @@
+@@ -1015,13 +1089,39 @@
    return retval;
  }
  
@@ -221,7 +198,7 @@ Index: pkg.c
      pkg->l_libs_merged = get_merged_from_back (pkg, get_l_libs, FALSE,
  					       !ignore_private_libs);
  
-@@ -1070,8 +1170,12 @@
+@@ -1029,8 +1129,12 @@
  }
  
  char *
@@ -235,7 +212,7 @@ Index: pkg.c
    return get_multi_merged_from_back (pkgs, get_l_libs, FALSE,
  				     !ignore_private_libs);
  }
-@@ -1094,9 +1198,13 @@
+@@ -1053,9 +1157,13 @@
  }
  
  char *
@@ -250,7 +227,7 @@ Index: pkg.c
      pkg->other_libs_merged = get_merged (pkg, get_other_libs, TRUE,
  					 !ignore_private_libs);
  
-@@ -1104,13 +1212,16 @@
+@@ -1063,13 +1171,16 @@
  }
  
  char *
@@ -269,7 +246,7 @@ Index: pkg.c
  {
    char *l_libs;
    char *L_libs;
-@@ -1120,9 +1231,9 @@
+@@ -1079,9 +1190,9 @@
    
    str = g_string_new ("");  
  
@@ -282,9 +259,9 @@ Index: pkg.c
    if (other_libs)
      g_string_append (str, other_libs);
 Index: pkg.h
---- pkg.h.orig	2009-08-15 21:44:19.000000000 +0200
-+++ pkg.h	2010-05-24 09:22:31.000000000 +0200
-@@ -90,13 +90,13 @@
+--- pkg.h.orig	2012-05-30 14:49:24.000000000 +0200
++++ pkg.h	2012-07-12 08:27:29.000000000 +0200
+@@ -75,13 +75,13 @@
  
  Package *get_package               (const char *name);
  Package *get_package_quiet         (const char *name);

pkgconfig/pkgconfig.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Building
 License:      GPL
-Version:      0.25
-Release:      20110530
+Version:      0.27
+Release:      20120712
 
 #   list of sources
 Source0:      http://pkgconfig.freedesktop.org/releases/pkg-config-%{version}.tar.gz