rpms/pkgconfig/F-8 conflicts.patch, NONE, 1.1 pkgconfig.spec, 1.42, 1.43

[Matthias Clasen (mclasen)]

Author: mclasen

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

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-8/pkgconfig.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pkgconfig.spec	29 Aug 2007 05:01:00 -0000	1.42
+++ pkgconfig.spec	16 Nov 2007 05:13:02 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.22
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
@@ -13,6 +13,8 @@
 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=13265
+Patch4:  conflicts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -26,6 +28,7 @@
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
 %patch3 -p1 -b .requires-private-fix
+%patch4 -p1 -b .conflicts
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -50,7 +53,10 @@
 %{_datadir}/aclocal/*
 
 %changelog
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1:0.22-3
+* Thu Nov 15 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.22-4
+- Fix handling of conflicts (#384421)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:0.22-3
 - Rebuild for selinux ppc32 issue.
 
 * Tue Aug  7 2007 Matthias Clasen <mclasen at redhat.com> - 1:0.22-2