rpms/pkgconfig/devel pkgconfig-0.15.0-reqprov.patch, 1.2, 1.3 pkgconfig.spec, 1.47, 1.48

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/pkgconfig/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8052

Modified Files:
	pkgconfig-0.15.0-reqprov.patch pkgconfig.spec 
Log Message:
Fix issues with Requires.private handling


pkgconfig-0.15.0-reqprov.patch:

Index: pkgconfig-0.15.0-reqprov.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/pkgconfig-0.15.0-reqprov.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pkgconfig-0.15.0-reqprov.patch	7 Jul 2005 19:59:37 -0000	1.2
+++ pkgconfig-0.15.0-reqprov.patch	8 Dec 2008 17:08:18 -0000	1.3
@@ -1,6 +1,7 @@
---- pkg-config-0.18.1/main.c.reqprov	2005-07-07 15:38:55.597133000 -0400
-+++ pkg-config-0.18.1/main.c	2005-07-07 15:40:19.400246000 -0400
-@@ -187,6 +187,8 @@
+diff -pur pkg-config-0.23.orig/main.c pkg-config-0.23/main.c
+--- pkg-config-0.23.orig/main.c	2008-01-16 14:06:48.000000000 -0800
++++ pkg-config-0.23/main.c	2008-10-24 14:18:51.000000000 -0700
+@@ -189,6 +189,8 @@ main (int argc, char **argv)
    int want_uninstalled = 0;
    char *variable_name = NULL;
    int want_exists = 0;
@@ -9,7 +10,7 @@
    char *required_atleast_version = NULL;
    char *required_exact_version = NULL;
    char *required_max_version = NULL;
-@@ -254,6 +256,10 @@
+@@ -258,6 +260,10 @@ main (int argc, char **argv)
        "show verbose information about missing or conflicting packages" },
      { "errors-to-stdout", 0, POPT_ARG_NONE, &want_stdout_errors, 0,
        "print errors from --print-errors to stdout not stderr" },
@@ -20,7 +21,7 @@
  #ifdef G_OS_WIN32
      { "dont-define-prefix", 0, POPT_ARG_NONE, &dont_define_prefix, 0,
        "don't try to override the value of prefix for each .pc file found with "
-@@ -545,6 +551,47 @@
+@@ -570,6 +576,66 @@ main (int argc, char **argv)
          }
      }
  
@@ -47,6 +48,8 @@
 +     while (pkgtmp != NULL)
 +       {
 +         Package *pkg = pkgtmp->data;
++
++         /* process Requires: */
 +         GSList *reqtmp = pkg->requires;
 +         while (reqtmp != NULL)
 +           {
@@ -61,6 +64,23 @@
 +                       req->version);
 +             reqtmp = g_slist_next (reqtmp);
 +           }
++
++         /* process Requires.private: */
++         reqtmp = pkg->requires_private;
++         while (reqtmp != NULL)
++           {
++             Package *deppkg = reqtmp->data;
++             RequiredVersion *req;
++             req = g_hash_table_lookup(pkg->required_versions, deppkg->key);
++             if ((req == NULL) || (req->comparison == ALWAYS_MATCH))
++               printf ("%s\n", deppkg->key);
++             else
++               printf ("%s %s %s\n", deppkg->key,
++                       comparison_to_str(req->comparison),
++                       req->version);
++             reqtmp = g_slist_next (reqtmp);
++           }
++
 +         pkgtmp = g_slist_next (pkgtmp);
 +       }
 +   }


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- pkgconfig.spec	6 Jun 2008 19:13:08 -0000	1.47
+++ pkgconfig.spec	8 Dec 2008 17:08:18 -0000	1.48
@@ -1,20 +1,18 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.23
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
 Group: Development/Tools
 Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{version}.tar.gz
-# https://bugs.freedesktop.org/show_bug.cgi?id=2661 
+# https://bugs.freedesktop.org/show_bug.cgi?id=5703
 Patch1:  pkgconfig-0.15.0-reqprov.patch
 # don't call out to glib-config, since our glib-config is a pkg-config wrapper
 Patch2:  pkg-config-0.21-compat-loop.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=4738
-Patch3:  pkg-config-0.21-requires-private-fix.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=16095
-Patch4: pkg-config-lib64-excludes.patch
+Patch3: pkg-config-lib64-excludes.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -27,8 +25,7 @@
 %setup -n pkg-config-%{version} -q
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
-%patch3 -p1 -b .requires-private-fix
-%patch4 -p0 -b .lib64
+%patch3 -p0 -b .lib64
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -53,6 +50,11 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Mon Dec  8 2008 Matthias Clasen  <mclasen at redhat.com> - 1:0.23-4
+- Remove a patch that is no longer necessary and causes more
+  problems than it solves (#224148)
+- Include Requires.private in --print-requires (#426106)
+
 * Fri Jun 06 2008 Colin Walters <walters at redhat.com> - 1:0.23-3
 - Add patch pkg-config-lib64-excludes.patch to make my jhbuild happier