rpms/pkgconfig/F-7 conflicts.patch, NONE, 1.1 pkgconfig.spec, 1.39, 1.40

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/pkgconfig/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256

Modified Files:
	pkgconfig.spec 
Added Files:
	conflicts.patch 
Log Message:
Fix handling of conflicts


conflicts.patch:

--- NEW FILE conflicts.patch ---
diff -up pkg-config-0.22/pkg.c.conflicts pkg-config-0.22/pkg.c
--- pkg-config-0.22/pkg.c.conflicts	2007-11-15 23:56:26.000000000 -0500
+++ pkg-config-0.22/pkg.c	2007-11-15 23:57:26.000000000 -0500
@@ -821,7 +821,7 @@ verify_package (Package *pkg)
    */
   
   recursive_fill_list (pkg, get_requires_private, &requires);
-  recursive_fill_list (pkg, get_conflicts, &conflicts);
+  conflicts = get_conflicts (pkg);
 
   requires_iter = requires;
   while (requires_iter != NULL)
@@ -843,7 +843,7 @@ verify_package (Package *pkg)
                              req->version, req->name,
                              ver->name,
                              comparison_to_str (ver->comparison),
-                             ver->version,
+                             ver->version ? ver->version : "(any)",
                              ver->owner->name,
                              ver->owner->version);
 
@@ -857,7 +857,6 @@ verify_package (Package *pkg)
     }
   
   g_slist_free (requires);
-  g_slist_free (conflicts);
 
   /* We make a list of system directories that gcc expects so we can remove
    * them.


Index: pkgconfig.spec
===================================================================
RCS file: /cvs/extras/rpms/pkgconfig/F-7/pkgconfig.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pkgconfig.spec	30 Mar 2007 05:41:50 -0000	1.39
+++ pkgconfig.spec	5 Feb 2008 18:14:40 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.21
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPL
 URL: http://pkgconfig.freedesktop.org
@@ -14,6 +14,8 @@
 Patch3:  pkg-config-0.21-requires-private-fix.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=8788
 Patch4:  pkg-config-0.21-recursive-private-libs.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=13265
+Patch5: conflicts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -28,6 +30,7 @@
 %patch2 -p1 -b .compat-loop
 %patch3 -p1 -b .requires-private-fix
 %patch4 -p1 -b .recursive-private-libs
+%patch5 -p1 -b .conflicts
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -52,6 +55,9 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Feb  5 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.21-6
+- Fix handling of conflicts (#384421)
+
 * Thu Mar 29 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.21-5
 - Fix --exists to ignore Requires.private
 - Fix Requires.private to operate fully recursive