Mailinglist Archive: opensuse-commit (1193 mails)
| < Previous | Next > |
commit perl-ExtUtils-PkgConfig
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 19 Mar 2008 13:06:49 +0100
- Message-id: <20080319120650.111EC678335@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package perl-ExtUtils-PkgConfig
checked in at Wed Mar 19 13:06:49 CET 2008.
--------
--- perl-ExtUtils-PkgConfig/perl-ExtUtils-PkgConfig.changes 2008-01-23
15:25:18.000000000 +0100
+++
/mounts/work_src_done/STABLE/perl-ExtUtils-PkgConfig/perl-ExtUtils-PkgConfig.changes
2008-03-17 11:09:10.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Mar 17 11:06:29 CET 2008 - anicka@xxxxxxx
+
+- update to 1.11
+ * Fix test failures.
+ * If pkg-config isn't found, warn and exit with status 0 instead of
+ just dying so that CPAN testers don't send bogus failure reports.
+
+-------------------------------------------------------------------
Old:
----
ExtUtils-PkgConfig-1.09.tar.bz2
New:
----
ExtUtils-PkgConfig-1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-ExtUtils-PkgConfig.spec ++++++
--- /var/tmp/diff_new_pack.Xh2314/_old 2008-03-19 13:06:01.000000000 +0100
+++ /var/tmp/diff_new_pack.Xh2314/_new 2008-03-19 13:06:01.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package perl-ExtUtils-PkgConfig (Version 1.09)
+# spec file for package perl-ExtUtils-PkgConfig (Version 1.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,9 +10,10 @@
# norootforbuild
+
Name: perl-ExtUtils-PkgConfig
BuildRequires: pkgconfig
-Version: 1.09
+Version: 1.11
Release: 1
Requires: perl = %{perl_version}
AutoReqProv: on
@@ -58,6 +59,11 @@
/var/adm/perl-modules/%{name}
%changelog
+* Mon Mar 17 2008 anicka@xxxxxxx
+- update to 1.11
+ * Fix test failures.
+ * If pkg-config isn't found, warn and exit with status 0 instead of
+ just dying so that CPAN testers don't send bogus failure reports.
* Wed Jan 23 2008 anicka@xxxxxxx
- update to 1.09
* Add support for more pkg-config commands: cflags-only-I,
++++++ ExtUtils-PkgConfig-1.09.tar.bz2 -> ExtUtils-PkgConfig-1.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/Changes
new/ExtUtils-PkgConfig-1.11/Changes
--- old/ExtUtils-PkgConfig-1.09/Changes 2008-01-22 21:34:40.000000000 +0100
+++ new/ExtUtils-PkgConfig-1.11/Changes 2008-03-15 00:35:52.000000000 +0100
@@ -1,5 +1,13 @@
Revision history for Perl extension ExtUtils::PkgConfig.
+1.11 Sat Mar 15 00:35:35 CET 2008
+ - Fix test failures.
+ - If pkg-config isn't found, warn and exit with status 0 instead of
+ just dying so that CPAN testers don't send bogus failure reports.
+
+1.10 Sat Feb 9 20:29:22 CET 2008
+ - Fix test failures with older versions of perl and pkg-config.
+
1.09 Tue Jan 22 21:34:35 CET 2008
- Add support for more pkg-config commands: cflags-only-I,
cflags-only-other, libs-only-other, and static-libs (RT #32426, patch
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/lib/ExtUtils/PkgConfig.pm
new/ExtUtils-PkgConfig-1.11/lib/ExtUtils/PkgConfig.pm
--- old/ExtUtils-PkgConfig-1.09/lib/ExtUtils/PkgConfig.pm 2008-01-22
21:33:38.000000000 +0100
+++ new/ExtUtils-PkgConfig-1.11/lib/ExtUtils/PkgConfig.pm 2008-03-15
00:34:57.000000000 +0100
@@ -24,7 +24,7 @@
use vars qw/ $VERSION $AUTOLOAD/;
-$VERSION = '1.09';
+$VERSION = '1.11';
sub import {
my $class = shift;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/Makefile.PL
new/ExtUtils-PkgConfig-1.11/Makefile.PL
--- old/ExtUtils-PkgConfig-1.09/Makefile.PL 2007-10-11 21:53:58.000000000
+0200
+++ new/ExtUtils-PkgConfig-1.11/Makefile.PL 2008-03-15 00:19:41.000000000
+0100
@@ -3,11 +3,20 @@
use ExtUtils::MakeMaker;
# don't go any further if pkg-config cannot be found.
-`pkg-config --version` or die "***
+my $have_pkg_config = `pkg-config --version`;
+
+if ($have_pkg_config eq "") {
+ # Warn and exit with status 0 to indicate (to the user and the CPAN
+ # testers infrastructure) that this module won't work on this machine.
+ warn <<"__EOW__";
+***
*** ExtUtils::PkgConfig requires the pkg-config utility, but it doesn't
-*** seem to be in your PATH. it is correctly installed?
+*** seem to be in your PATH. Is it correctly installed?
*** PATH=$ENV{PATH}
-***\n";
+***
+__EOW__
+ exit 0;
+}
WriteMakefile(
# FIXME this doesn't work very well with native win32 perl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/META.yml
new/ExtUtils-PkgConfig-1.11/META.yml
--- old/ExtUtils-PkgConfig-1.09/META.yml 2008-01-22 21:38:29.000000000
+0100
+++ new/ExtUtils-PkgConfig-1.11/META.yml 2008-03-15 00:38:08.000000000
+0100
@@ -1,10 +1,10 @@
--- #YAML:1.0
name: ExtUtils-PkgConfig
-version: 1.09
+version: 1.11
abstract: ~
license: ~
author: ~
-generated_by: ExtUtils::MakeMaker version 6.42
+generated_by: ExtUtils::MakeMaker version 6.44
distribution_type: module
requires:
meta-spec:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/t/2.t
new/ExtUtils-PkgConfig-1.11/t/2.t
--- old/ExtUtils-PkgConfig-1.09/t/2.t 2008-01-20 21:59:25.000000000 +0100
+++ new/ExtUtils-PkgConfig-1.11/t/2.t 2008-03-15 00:28:25.000000000 +0100
@@ -1,5 +1,6 @@
+#!/usr/bin/perl
#
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/ExtUtils-PkgConfig/t/2.t,v 1.2
2008/01/20 20:59:25 kaffeetisch Exp $
+# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/ExtUtils-PkgConfig/t/2.t,v 1.4
2008/03/14 23:28:25 kaffeetisch Exp $
#
use strict;
@@ -10,36 +11,43 @@
$ENV{PKG_CONFIG_PATH} = './t/';
-my @cmds = qw(libs
- modversion
- cflags
- cflags-only-I
- cflags-only-other
- libs-only-L
- libs-only-l
- libs-only-other);
-my $data;
+my ($major, $minor) = split /\./, `pkg-config --version`; # Ignore micro part
+diag ("Testing pkg-config $major.$minor");
+
+cmd_ok ('modversion');
+cmd_ok ('cflags');
+cmd_ok ('cflags-only-I');
+cmd_ok ('libs');
+cmd_ok ('libs-only-L');
+cmd_ok ('libs-only-l');
+
+SKIP: {
+ skip '*-only-other', 2
+ unless ($major > 0 || $minor >= 15);
-foreach my $cmd (@cmds) {
- $data = ExtUtils::PkgConfig->$cmd(qw/test_glib-2.0/);
- ok( defined $data );
+ cmd_ok ('cflags-only-other');
+ cmd_ok ('libs-only-other');
}
-# special case
-$data = ExtUtils::PkgConfig->static_libs(qw/test_glib-2.0/);
-like ($data, qr/pthread/);
+SKIP: {
+ skip 'static libs', 1
+ unless ($major > 0 || $minor >= 20);
+
+ my $data = ExtUtils::PkgConfig->static_libs(qw/test_glib-2.0/);
+ like ($data, qr/pthread/);
+}
+
+my $data;
$data = ExtUtils::PkgConfig->variable(qw/test_glib-2.0/, 'glib_genmarshal');
-ok( defined $data );
+ok (defined $data);
$data = ExtUtils::PkgConfig->variable(qw/test_glib-2.0/, '__bad__');
-ok( not defined $data );
+ok (not defined $data);
-# Calling these with invalid packages is not supported.
-# foreach my $cmd (@cmds) {
-# eval { $data = ExtUtils::PkgConfig->$cmd(qw/__bad__/); };
-# ok( $@ );
-# }
+sub cmd_ok {
+ my ($cmd, $desc) = @_;
-# eval { $data = ExtUtils::PkgConfig->variable(qw/__bad__/,
'glib_genmarshal'); };
-# ok( $@ );
+ my $data = ExtUtils::PkgConfig->$cmd(qw/test_glib-2.0/);
+ ok (defined $data, $desc);
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/t/4.t
new/ExtUtils-PkgConfig-1.11/t/4.t
--- old/ExtUtils-PkgConfig-1.09/t/4.t 2008-01-20 22:05:53.000000000 +0100
+++ new/ExtUtils-PkgConfig-1.11/t/4.t 2008-03-15 00:28:25.000000000 +0100
@@ -1,11 +1,11 @@
#
-# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/ExtUtils-PkgConfig/t/4.t,v 1.3
2008/01/20 21:05:17 kaffeetisch Exp $
+# $Header: /cvsroot/gtk2-perl/gtk2-perl-xs/ExtUtils-PkgConfig/t/4.t,v 1.4
2008/03/14 23:28:25 kaffeetisch Exp $
#
use strict;
use warnings;
-use Test::More tests => 22;
+use Test::More tests => 20;
use ExtUtils::PkgConfig;
require 't/swallow_stderr.inc';
@@ -57,8 +57,8 @@
ok (contains ($macros, 'TEST_MINOR_VERSION'));
ok (contains ($macros, 'TEST_MICRO_VERSION'));
ok (contains ($macros, 'TEST_CHECK_VERSION'));
-ok (close $fh);
-ok (unlink $header);
+close $fh;
+unlink $header;
swallow_stderr (sub {
eval {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/t/swallow_stderr.inc
new/ExtUtils-PkgConfig-1.11/t/swallow_stderr.inc
--- old/ExtUtils-PkgConfig-1.09/t/swallow_stderr.inc 2008-01-20
22:05:17.000000000 +0100
+++ new/ExtUtils-PkgConfig-1.11/t/swallow_stderr.inc 2008-02-09
16:32:13.000000000 +0100
@@ -1,14 +1,14 @@
sub swallow_stderr {
my ($code) = @_;
- open my $old_stderr, '>&', \*STDERR;
+ # We can't use the three-arg form with >& because perl 5.6 doesn't seem
+ # to support that.
+ open my $old_stderr, '>&STDERR';
close STDERR;
- open STDERR, '>', \(my $trashcan);
$code->();
- close STDERR;
- open STDERR, '>&', $old_stderr;
+ open STDERR, ">&$old_stderr";
}
1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/ExtUtils-PkgConfig-1.09/t/test_glib-2.0.pc
new/ExtUtils-PkgConfig-1.11/t/test_glib-2.0.pc
--- old/ExtUtils-PkgConfig-1.09/t/test_glib-2.0.pc 2008-01-20
21:54:53.000000000 +0100
+++ new/ExtUtils-PkgConfig-1.11/t/test_glib-2.0.pc 2008-03-15
00:07:09.000000000 +0100
@@ -1,7 +1,7 @@
-prefix=/usr
-exec_prefix=/usr
-libdir=/usr/lib
-includedir=/usr/include
+prefix=/opt/glib
+exec_prefix=${prefix}/libexec
+libdir=${prefix}/lib
+includedir=${prefix}/include
glib_genmarshal=glib-genmarshal
gobject_query=gobject-query
@@ -10,7 +10,7 @@
Name: GLib
Description: C Utility Library
Version: 2.2.3
-Libs: -L${libdir} -lglib-2.0
+Libs: -L${libdir} -lglib-2.0 -Wl,--export-dynamic
Libs.private: -pthread
-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include
+Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include
-DG_DISABLE_DEPRECATED
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |