Hello community,
here is the log from the commit of package pkg-config
checked in at Fri Feb 9 01:14:50 CET 2007.
--------
--- GNOME/pkg-config/pkg-config.changes 2007-01-29 16:33:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/pkg-config/pkg-config.changes 2007-02-08 12:24:24.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Feb 8 12:16:12 CET 2007 - sbrabec@suse.cz
+
+- Updated to version 0.21:
+ * Cosmetic fixes of from pkg.m4.
+ * Documentation fixes.
+ * Always add the Cflags from dependent packages.
+ * Added internal pkg-config package.
+- Fixed Obsoletes (#243508).
+- Use --with-pc_path instead of environment variables.
+
+-------------------------------------------------------------------
Old:
----
pkg-config-0.20.tar.bz2
New:
----
pkg-config-0.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pkg-config.spec ++++++
--- /var/tmp/diff_new_pack.a32134/_old 2007-02-09 01:14:26.000000000 +0100
+++ /var/tmp/diff_new_pack.a32134/_new 2007-02-09 01:14:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package pkg-config (Version 0.20)
+# spec file for package pkg-config (Version 0.21)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,14 +12,14 @@
Name: pkg-config
URL: http://pkgconfig.freedesktop.org/
-Version: 0.20
-Release: 11
+Version: 0.21
+Release: 1
License: GNU General Public License (GPL)
Group: System/Packages
Autoreqprov: on
# Old name for version <= 0.17 and SuSE Linux <= 10.2 & CODE10
Provides: pkgconfig = %{version}-%{release}
-Obsoletes: pkgconfig < %{version}-%{release}
+Obsoletes: pkgconfig < 0.21
Summary: A library management system
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -46,27 +46,16 @@
autoconf
# GNU_SOURCE needed for strsignal() in gstrfuncs.c
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
-%configure
+%configure\
+%if "%{_lib}" == "lib"
+ --with-pc_path=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:/opt/kde3/%{_lib}/pkgconfig
+%else
+ --with-pc_path=/usr/local/%{_lib}/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:%{_libdir}/pkgconfig:%{_datadir}/pkgconfig:/opt/kde3/%{_lib}/pkgconfig
+%endif
make %{?jobs:-j%jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-echo 'if test -z "$PKG_CONFIG_PATH" ; then
-%if "%{_lib}" == "lib"
-%define _usr_local_lib_pkgconfig /usr/local/lib/pkgconfig
-%else
-%define _usr_local_lib_pkgconfig /usr/local/%{_lib}/pkgconfig:/usr/local/lib/pkgconfig
-%endif
- export PKG_CONFIG_PATH="%{_usr_local_lib_pkgconfig}:/usr/local/share/pkgconfig:/opt/kde3/%{_lib}/pkgconfig"
-else
- export PKG_CONFIG_PATH="%{_usr_local_lib_pkgconfig}:/usr/local/share/pkgconfig:/opt/kde3/%{_lib}/pkgconfig:$PKG_CONFIG_PATH"
-fi'> $RPM_BUILD_ROOT/etc/profile.d/pkgconfig.sh
-echo 'if ( ${?PKG_CONFIG_PATH} ) then
- setenv PKG_CONFIG_PATH %{_usr_local_lib_pkgconfig}:/usr/local/share/pkgconfig:/opt/kde3/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}
-else
- setenv PKG_CONFIG_PATH %{_usr_local_lib_pkgconfig}:/usr/local/share/pkgconfig:/opt/kde3/%{_lib}/pkgconfig
-endif' > $RPM_BUILD_ROOT/etc/profile.d/pkgconfig.csh
%if %suse_version <= 930
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pkgconfig
%endif
@@ -76,8 +65,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING README NEWS ChangeLog
-/etc/profile.d/pkgconfig.*
+%doc AUTHORS COPYING NEWS README ChangeLog
%{_bindir}/*
%{_datadir}/aclocal/*.m4
%if %suse_version <= 930
@@ -86,6 +74,14 @@
%doc %{_mandir}/man1/*.*
%changelog -n pkg-config
+* Thu Feb 08 2007 - sbrabec@suse.cz
+- Updated to version 0.21:
+ * Cosmetic fixes of from pkg.m4.
+ * Documentation fixes.
+ * Always add the Cflags from dependent packages.
+ * Added internal pkg-config package.
+- Fixed Obsoletes (#243508).
+- Use --with-pc_path instead of environment variables.
* Mon Jan 29 2007 - sbrabec@suse.cz
- Removed references to /opt/gnome.
- Simplified PKG_CONFIG_PATH (#235310).
++++++ pkg-config-0.20.tar.bz2 -> pkg-config-0.21.tar.bz2 ++++++
++++ 31933 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/ChangeLog new/pkg-config-0.21/ChangeLog
--- old/pkg-config-0.20/ChangeLog 2005-10-17 07:00:37.000000000 +0200
+++ new/pkg-config-0.21/ChangeLog 2006-08-16 21:09:30.000000000 +0200
@@ -1,5 +1,43 @@
+2006-08-16 Tollef Fog Heen
+
+ * configure.in: Release 0.21
+
+ * NEWS: Update for 0.21
+
+ * pkg.c: Add internal pkg-config package which can be queried for
+ version number, name and URL for now. More information will be
+ added later. Debian #254289, #287339
+
+ * parse.c (trim_and_sub): Since %{...} has not been used for a
+ long time, there is no point in being able to escape %. However,
+ make the code able to escape $ by doubling the $ to $$.
+ Debian #378570
+
+ * pkg.c (packages_get_other_cflags, package_get_other_cflags)
+ (packages_get_I_cflags): Always add all cflags. Debian #340904
+
+ * main.c (main): Always add the elements from PKG_CONFIG_PATH.
+ Freedesktop #4795.
+
+ * pkg-config.1: Apply patch from Ed Catmur to document
+ PKG_PROG_PKG_CONFIG and that it should be used if the first call
+ to PKG_CHECK_MODULES might not happen. Freedesktop #7742
+
+ * pkg-config.1: Apply patch from Ed Catmur to document
+ PKG_CHECK_EXIST. Thanks a lot for both patches. Freedesktop
+ #7741
+
+2005-12-28 Tollef Fog Heen
+
+ * configure.in, Makefile.am: Only use -Wall and other gcc-only
+ flags when we don't have a set of CFLAGS already set and we're
+ using gcc. Freedesktop #4888.
+
2005-10-17 Tollef Fog Heen
+ * pkg.m4: Do AC_MSG_RESULT([no]) even if $4 is set (so we don't
+ fail). Gnome #166537.
+
* NEWS: Add missing news and really release 0.20, since I didn't
get around to actually uploading last night.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/configure.in new/pkg-config-0.21/configure.in
--- old/pkg-config-0.20/configure.in 2005-10-16 20:17:13.000000000 +0200
+++ new/pkg-config-0.21/configure.in 2006-08-16 21:09:30.000000000 +0200
@@ -1,7 +1,7 @@
AC_INIT(pkg-config.1)
-AM_INIT_AUTOMAKE(pkg-config, 0.20)
+AM_INIT_AUTOMAKE(pkg-config, 0.21)
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
@@ -58,6 +58,16 @@
esac
AC_MSG_RESULT($use_indirect_deps)
+#
+# Choose default CFLAGS and warnings depending on compiler.
+#
+
+WARN_CFLAGS=""
+if test "${GCC}" = "yes" && test "${ac_env_CFLAGS_set}" != "set"; then
+ WARN_CFLAGS="-g -Wall -O2"
+fi
+AC_SUBST(WARN_CFLAGS)
+
AC_DEFINE_UNQUOTED(ENABLE_INDIRECT_DEPS, `test $use_indirect_deps = no; echo $?`, [Link library to all dependent libraries, not only directly needed ones])
AC_MSG_CHECKING([for Win32])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/main.c new/pkg-config-0.21/main.c
--- old/pkg-config-0.20/main.c 2005-10-16 20:04:50.000000000 +0200
+++ new/pkg-config-0.21/main.c 2006-08-16 19:54:56.000000000 +0200
@@ -281,18 +281,17 @@
debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n");
}
+ search_path = getenv ("PKG_CONFIG_PATH");
+ if (search_path)
+ {
+ add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
+ }
if (getenv("PKG_CONFIG_LIBDIR") != NULL)
{
add_search_dirs(getenv("PKG_CONFIG_LIBDIR"), G_SEARCHPATH_SEPARATOR_S);
}
else
{
- search_path = getenv ("PKG_CONFIG_PATH");
- if (search_path)
- {
- add_search_dirs(search_path, G_SEARCHPATH_SEPARATOR_S);
- }
-
add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/Makefile.am new/pkg-config-0.21/Makefile.am
--- old/pkg-config-0.20/Makefile.am 2005-10-16 19:09:39.000000000 +0200
+++ new/pkg-config-0.21/Makefile.am 2006-08-16 19:05:30.000000000 +0200
@@ -14,7 +14,7 @@
EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32
bin_PROGRAMS = pkg-config
-AM_CFLAGS=-g -Wall -O2
+AM_CFLAGS=@WARN_CFLAGS@
INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/NEWS new/pkg-config-0.21/NEWS
--- old/pkg-config-0.20/NEWS 2005-10-17 07:00:03.000000000 +0200
+++ new/pkg-config-0.21/NEWS 2006-08-16 21:06:35.000000000 +0200
@@ -1,3 +1,14 @@
+pkg-config 0.21
+===
+ - Fix some cosmetic output from pkg.m4
+ - Fix build problems with !gcc due to always passing -Wall
+ - Documentation fixes
+ - We now always add the Cflags from packages we depend on, whether
+ they are public or private dependencies. The discussion surrouding
+ this change can be found in http://bugs.debian.org/340904 .
+ - Add internal pkg-config package which can be queried for version
+ number and other information.
+
pkg-config 0.20
===
- Fix test suite to work on Solaris. Yay non-POSIX /bin/sh :-(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/parse.c new/pkg-config-0.21/parse.c
--- old/pkg-config-0.20/parse.c 2005-10-16 19:09:39.000000000 +0200
+++ new/pkg-config-0.21/parse.c 2006-08-16 20:45:45.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002, 2005 Red Hat Inc.
+ * Copyright (C) 2001, 2002, 2005-2006 Red Hat Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -169,8 +169,8 @@
if (p[0] == '$' &&
p[1] == '$')
{
- /* escaped % */
- g_string_append_c (subst, '%');
+ /* escaped $ */
+ g_string_append_c (subst, '$');
p += 2;
}
else if (p[0] == '$' &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/pkg.c new/pkg-config-0.21/pkg.c
--- old/pkg-config-0.20/pkg.c 2005-10-16 19:28:31.000000000 +0200
+++ new/pkg-config-0.21/pkg.c 2006-08-16 21:01:04.000000000 +0200
@@ -57,6 +57,15 @@
gboolean ignore_requires = FALSE;
gboolean ignore_private_libs = TRUE;
+static Package pkg_config_package = {
+ .key = PACKAGE,
+ .name = PACKAGE,
+ .version = VERSION, /* .version */
+ .description = "returns metainformation about installed libraries",
+ .url = "http://pkg-config.freedesktop.org",
+ 0 /* keep the rest as null */
+};
+
void
add_search_dir (const char *path)
{
@@ -275,6 +284,9 @@
Package *pkg = NULL;
const char *location;
+ if (strcmp(PACKAGE, name) == 0)
+ return &pkg_config_package;
+
pkg = g_hash_table_lookup (packages, name);
if (pkg)
@@ -1139,14 +1151,14 @@
packages_get_I_cflags (GSList *pkgs)
{
/* sort by path position so PKG_CONFIG_PATH affects -I flag order */
- return get_multi_merged (pkgs, get_I_cflags, TRUE, FALSE);
+ return get_multi_merged (pkgs, get_I_cflags, TRUE, TRUE);
}
char *
package_get_other_cflags (Package *pkg)
{
if (pkg->other_cflags_merged == NULL)
- pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, FALSE);
+ pkg->other_cflags_merged = get_merged (pkg, get_other_cflags, TRUE, TRUE);
return pkg->other_cflags_merged;
}
@@ -1154,7 +1166,7 @@
char *
packages_get_other_cflags (GSList *pkgs)
{
- return get_multi_merged (pkgs, get_other_cflags, TRUE, FALSE);
+ return get_multi_merged (pkgs, get_other_cflags, TRUE, TRUE);
}
char *
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/pkg-config.1 new/pkg-config-0.21/pkg-config.1
--- old/pkg-config-0.20/pkg-config.1 2005-10-16 19:09:39.000000000 +0200
+++ new/pkg-config-0.21/pkg-config.1 2006-08-16 19:38:33.000000000 +0200
@@ -300,11 +300,24 @@
However, it will set the variable MYSTUFF_PKG_ERRORS, which you can
use to display what went wrong.
+Note that if there is a possibility the first call to
+PKG_CHECK_MODULES might not happen, you should be sure to include an
+explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+
.I "PKG_PROG_PKG_CONFIG([MIN-VERSION])"
Defines the PKG_CONFIG variable to the best pkg-config available,
useful if you need pkg-config but don't want to use PKG_CHECK_MODULES.
+.I "PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])"
+
+Check to see whether a particular set of modules exists. Similar
+to PKG_CHECK_MODULES(), but does not set variables or print errors.
+
+Similar to PKG_CHECK_MODULES, make sure that the first instance of
+this or PKG_CHECK_MODULES is called, or make sure to call
+PKG_CHECK_EXISTS manually
+
.SH METADATA FILE SYNTAX
To add a library to the set of packages \fIpkg-config\fP knows about,
simply install a \fI.pc\fP file. You should install this file to
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pkg-config-0.20/pkg.m4 new/pkg-config-0.21/pkg.m4
--- old/pkg-config-0.20/pkg.m4 2005-10-16 20:12:32.000000000 +0200
+++ new/pkg-config-0.21/pkg.m4 2006-08-16 19:05:30.000000000 +0200
@@ -136,7 +136,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org