rpms/pkgconfig/devel pkg-config-0.21-requires-private-fix.patch, 1.2, 1.3 pkgconfig.spec, 1.44, 1.45

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/pkgconfig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19110

Modified Files:
	pkgconfig.spec 
Added Files:
	pkg-config-0.21-requires-private-fix.patch 
Log Message:
readd a patch that was dropped prematurely


pkg-config-0.21-requires-private-fix.patch:

Index: pkg-config-0.21-requires-private-fix.patch
===================================================================
RCS file: pkg-config-0.21-requires-private-fix.patch
diff -N pkg-config-0.21-requires-private-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg-config-0.21-requires-private-fix.patch	31 Jan 2008 04:05:01 -0000	1.3
@@ -0,0 +1,33 @@
+--- pkg-config-0.21/parse.c.privreq	2006-08-16 13:45:45.000000000 -0500
++++ pkg-config-0.21/parse.c	2007-01-24 08:26:13.000000000 -0600
+@@ -946,7 +946,12 @@
+       else if (strcmp (tag, "Version") == 0)
+         parse_version (pkg, p, path);
+       else if (strcmp (tag, "Requires.private") == 0)
+-	parse_requires_private (pkg, p, path);
++	{
++          if (ignore_private_libs == FALSE)
++	    parse_requires_private (pkg, p, path);
++          else
++	    goto cleanup;
++        }
+       else if (strcmp (tag, "Requires") == 0)
+ 	{
+           if (ignore_requires == FALSE)
+@@ -954,9 +959,13 @@
+           else
+ 	    goto cleanup;
+         }
+-      else if ((strcmp (tag, "Libs.private") == 0) && 
+-               ignore_private_libs == FALSE)
+-        parse_libs_private (pkg, p, path);
++      else if (strcmp (tag, "Libs.private") == 0)
++	{
++          if (ignore_private_libs == FALSE)
++	    parse_libs_private (pkg, p, path);
++          else
++	    goto cleanup;
++        }
+       else if (strcmp (tag, "Libs") == 0)
+         parse_libs (pkg, p, path);
+       else if (strcmp (tag, "Cflags") == 0 ||


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/pkgconfig/devel/pkgconfig.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pkgconfig.spec	31 Jan 2008 02:17:59 -0000	1.44
+++ pkgconfig.spec	31 Jan 2008 04:05:01 -0000	1.45
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.23
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
@@ -11,6 +11,8 @@
 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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -23,6 +25,7 @@
 %setup -n pkg-config-%{version} -q
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
+%patch3 -p1 -b .requires-private-fix
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -47,6 +50,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Wed Jan 30 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.23-2
+- Readd the requires.private fix that was dropped prematurely
+
 * Wed Jan 30 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.23-1
 - Update to 0.23