Commit d469111aa2d82467a2a509cb38a411ad21e1bbd7
1 parent
97d10c66
minor tweaks so rpm creation works properly in rhel5
git-svn-id: svn+q:///qpdf/trunk@911 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
3 changed files
with
25 additions
and
3 deletions
ChangeLog
| 1 | +2009-10-26 Jay Berkenbilt <ejb@ql.org> | ||
| 2 | + | ||
| 3 | + * Work around failure of PCRE test case; this test case exercises | ||
| 4 | + an aspect of PCRE that qpdf does not use, and the test fails with | ||
| 5 | + the version of PCRE on Red Hat Enterprise Linux 5, so we ignore | ||
| 6 | + failure on this particular test case. | ||
| 7 | + | ||
| 8 | + * Fix RPM .spec file to include "C" examples | ||
| 9 | + | ||
| 1 | 2009-10-24 Jay Berkenbilt <ejb@ql.org> | 10 | 2009-10-24 Jay Berkenbilt <ejb@ql.org> |
| 2 | 11 | ||
| 3 | * 2.1.rc1: release | 12 | * 2.1.rc1: release |
libtests/qtest/pcre.test
| @@ -18,11 +18,24 @@ $td->runtest("PCRE", | @@ -18,11 +18,24 @@ $td->runtest("PCRE", | ||
| 18 | chop(my $supported = `pcre --unicode-classes-supported`); | 18 | chop(my $supported = `pcre --unicode-classes-supported`); |
| 19 | if ($supported =~ m/^1/) | 19 | if ($supported =~ m/^1/) |
| 20 | { | 20 | { |
| 21 | + my $xflags = 0; | ||
| 22 | + if (`pcre --unicode-classes | wc -l` == 1) | ||
| 23 | + { | ||
| 24 | + # On Red Hat Enterprise Linux 5, the version of pcre provided | ||
| 25 | + # by default claims to support unicode character classes, but | ||
| 26 | + # they don't actually work. Since qpdf doesn't use this | ||
| 27 | + # functionality, we won't care if this particular test case | ||
| 28 | + # fails. If someone were to make general use of this wrapper, | ||
| 29 | + # this test should be re-enabled, but on the other hand, they | ||
| 30 | + # could just use the C++ interface that's been added to pcre | ||
| 31 | + # since this code was written. | ||
| 32 | + $xflags |= $td->EXPECT_FAILURE; | ||
| 33 | + } | ||
| 21 | $td->runtest("unicode character classes", | 34 | $td->runtest("unicode character classes", |
| 22 | {$td->COMMAND => "pcre --unicode-classes"}, | 35 | {$td->COMMAND => "pcre --unicode-classes"}, |
| 23 | {$td->FILE => "pcre-unicode-classes.out", | 36 | {$td->FILE => "pcre-unicode-classes.out", |
| 24 | $td->EXIT_STATUS => 0}, | 37 | $td->EXIT_STATUS => 0}, |
| 25 | - $td->NORMALIZE_NEWLINES); | 38 | + $td->NORMALIZE_NEWLINES | $xflags); |
| 26 | } | 39 | } |
| 27 | else | 40 | else |
| 28 | { | 41 | { |
qpdf.spec
| @@ -60,9 +60,9 @@ rm -rf $RPM_BUILD_ROOT | @@ -60,9 +60,9 @@ rm -rf $RPM_BUILD_ROOT | ||
| 60 | # autoconf. | 60 | # autoconf. |
| 61 | cp -a $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} install-docs | 61 | cp -a $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} install-docs |
| 62 | mkdir -p install-examples/examples | 62 | mkdir -p install-examples/examples |
| 63 | -cp -p examples/*.cc install-examples/examples | 63 | +cp -p examples/*.cc examples/*.c install-examples/examples |
| 64 | # Red Hat doesn't ship .la files. | 64 | # Red Hat doesn't ship .la files. |
| 65 | -rm -rf $RPM_BUILD_ROOT%{_libdir}/libqpdf.la | 65 | +rm -f $RPM_BUILD_ROOT%{_libdir}/libqpdf.la |
| 66 | 66 | ||
| 67 | %post -p /sbin/ldconfig | 67 | %post -p /sbin/ldconfig |
| 68 | 68 |