diff options
author | Jay Berkenbilt <ejb@ql.org> | 2009-10-27 02:51:56 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2009-10-27 02:51:56 +0100 |
commit | d469111aa2d82467a2a509cb38a411ad21e1bbd7 (patch) | |
tree | 3f708202049ebcbe5dcc2e4337efa42f5212efa5 | |
parent | 97d10c6690e4d7971af015fe08d5369266bf3266 (diff) | |
download | qpdf-d469111aa2d82467a2a509cb38a411ad21e1bbd7.tar.zst |
minor tweaks so rpm creation works properly in rhel5
git-svn-id: svn+q:///qpdf/trunk@911 71b93d88-0707-0410-a8cf-f5a4172ac649
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | libtests/qtest/pcre.test | 15 | ||||
-rw-r--r-- | qpdf.spec | 4 |
3 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2009-10-26 Jay Berkenbilt <ejb@ql.org> + + * Work around failure of PCRE test case; this test case exercises + an aspect of PCRE that qpdf does not use, and the test fails with + the version of PCRE on Red Hat Enterprise Linux 5, so we ignore + failure on this particular test case. + + * Fix RPM .spec file to include "C" examples + 2009-10-24 Jay Berkenbilt <ejb@ql.org> * 2.1.rc1: release diff --git a/libtests/qtest/pcre.test b/libtests/qtest/pcre.test index 89a1d83c..9e0ebe1a 100644 --- a/libtests/qtest/pcre.test +++ b/libtests/qtest/pcre.test @@ -18,11 +18,24 @@ $td->runtest("PCRE", chop(my $supported = `pcre --unicode-classes-supported`); if ($supported =~ m/^1/) { + my $xflags = 0; + if (`pcre --unicode-classes | wc -l` == 1) + { + # On Red Hat Enterprise Linux 5, the version of pcre provided + # by default claims to support unicode character classes, but + # they don't actually work. Since qpdf doesn't use this + # functionality, we won't care if this particular test case + # fails. If someone were to make general use of this wrapper, + # this test should be re-enabled, but on the other hand, they + # could just use the C++ interface that's been added to pcre + # since this code was written. + $xflags |= $td->EXPECT_FAILURE; + } $td->runtest("unicode character classes", {$td->COMMAND => "pcre --unicode-classes"}, {$td->FILE => "pcre-unicode-classes.out", $td->EXIT_STATUS => 0}, - $td->NORMALIZE_NEWLINES); + $td->NORMALIZE_NEWLINES | $xflags); } else { @@ -60,9 +60,9 @@ rm -rf $RPM_BUILD_ROOT # autoconf. cp -a $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} install-docs mkdir -p install-examples/examples -cp -p examples/*.cc install-examples/examples +cp -p examples/*.cc examples/*.c install-examples/examples # Red Hat doesn't ship .la files. -rm -rf $RPM_BUILD_ROOT%{_libdir}/libqpdf.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libqpdf.la %post -p /sbin/ldconfig |