Merge commit 'fdo/master'
authorKristian H?gsberg <krh@redhat.com>
Sat Jun 28 19:22:55 2008 -0400 (2008-06-28)
changeset 298ddc35bb593ef
parent 294 d7ecddf38c3d
parent 297 82368b925016
child 299 d4f7f167b8bb
Merge commit 'fdo/master'
librazor/razor.c
     1.1 --- a/data/razor.pc.in	Sat Jun 28 18:33:15 2008 -0400
     1.2 +++ b/data/razor.pc.in	Sat Jun 28 19:22:55 2008 -0400
     1.3 @@ -6,7 +6,7 @@
     1.4  Name: razor
     1.5  Description: library for depsolving, installing and removing packages
     1.6  Version: @VERSION@
     1.7 -Requires: expat curl
     1.8 -Libs: -L${libdir} -lexpat -lz -lcurl
     1.9 +Requires: libcurl
    1.10 +Libs: -L${libdir} -lexpat -lz -lrazor
    1.11  Cflags: -I${includedir}/razor
    1.12  
     2.1 --- a/librazor/razor.c	Sat Jun 28 18:33:15 2008 -0400
     2.2 +++ b/librazor/razor.c	Sat Jun 28 19:22:55 2008 -0400
     2.3 @@ -395,10 +395,14 @@
     2.4  {
     2.5  	const char *pool = set->details_string_pool.data;
     2.6  
     2.7 -	*summary = &pool[package->summary];
     2.8 -	*description = &pool[package->description];
     2.9 -	*url = &pool[package->url];
    2.10 -	*license = &pool[package->license];
    2.11 +	if (summary != NULL)
    2.12 +		*summary = &pool[package->summary];
    2.13 +	if (description != NULL)
    2.14 +		*description = &pool[package->description];
    2.15 +	if (url != NULL)
    2.16 +		*url = &pool[package->url];
    2.17 +	if (license != NULL)
    2.18 +		*license = &pool[package->license];
    2.19  }
    2.20  
    2.21  RAZOR_EXPORT const char *