[plplot] - Don't pull in requires from examples - Fail %check section if tests fail

Orion Poplawski orion at fedoraproject.org
Tue Oct 12 19:21:33 UTC 2010


commit ff0de7569a7cb156ce148155c39c70d0625199e9
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Oct 12 13:21:42 2010 -0600

    - Don't pull in requires from examples
    - Fail %check section if tests fail

 plplot.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index 191ce2c..0136e6e 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -24,7 +24,7 @@
 
 Name:           plplot
 Version:        5.9.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -78,6 +78,7 @@ BuildRequires:  qt-devel
 BuildRequires:  PyQt4-devel
 #For Qt tests
 BuildRequires:  xorg-x11-xauth, xorg-x11-server-Xvfb
+BuildRequires:  selinux-policy-targeted
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires:       gnu-free-mono-fonts
@@ -394,6 +395,9 @@ done
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/cmake/modules/Platform
 
+#Don't pull in script interpreters for example binaries
+chmod -x $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/tk/tk*
+
 
 %check
 cd fedora
@@ -408,7 +412,7 @@ ERRORFILE=`mktemp`
 %ifarch ppc ppc64
 xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare|ocaml'
 %else
-xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare' || cat $ERRORFILE
+xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare' || cat $ERRORFILE && exit 1
 %endif
 
 
@@ -688,6 +692,10 @@ fi
 
 
 %changelog
+* Tue Oct 12 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.7-2
+- Don't pull in requires from examples
+- Fail %%check section if tests fail
+
 * Mon Oct 11 2010 Orion Poplawski <orion at cora.nwra.com> - 5.9.7-1
 - Update to 5.9.7
 - Rebase multiarch patch


More information about the scm-commits mailing list