New upstream version.
Drop -volatile patch, no longer needed. Update time-related configure fix again.
This commit is contained in:
parent
b80917974b
commit
0cc5515484
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,5 +1,3 @@
|
||||
/check-0.9.9.tar.gz
|
||||
/check-0.9.10.tar.gz
|
||||
/check-0.9.11.tar.gz
|
||||
/check-0.9.12.tar.gz
|
||||
/check-0.9.13.tar.gz
|
||||
/check-0.9.14.tar.gz
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- ./src/check_run.c.orig 2014-05-29 21:58:32.000000000 -0600
|
||||
+++ ./src/check_run.c 2014-06-09 09:32:10.644294320 -0600
|
||||
@@ -230,7 +230,7 @@ static int srunner_run_unchecked_setup(S
|
||||
TestResult *tr;
|
||||
List *l;
|
||||
Fixture *f;
|
||||
- int rval = 1;
|
||||
+ volatile int rval = 1;
|
||||
|
||||
set_fork_status(CK_NOFORK);
|
||||
|
20
check.spec
20
check.spec
@ -1,6 +1,6 @@
|
||||
Name: check
|
||||
Version: 0.9.13
|
||||
Release: 2%{?dist}
|
||||
Version: 0.9.14
|
||||
Release: 1%{?dist}
|
||||
Summary: A unit test framework for C
|
||||
Source0: http://downloads.sourceforge.net/check/%{name}-%{version}.tar.gz
|
||||
Group: Development/Tools
|
||||
@ -8,8 +8,6 @@ License: LGPLv2+
|
||||
URL: http://check.sourceforge.net/
|
||||
# Only needed for autotools in Fedora 21+
|
||||
Patch0: %{name}-0.9.11-info-in-builddir.patch
|
||||
# Result variable might be clobbered by longjmp()
|
||||
Patch1: %{name}-0.9.13-volatile.patch
|
||||
BuildRequires: pkgconfig, libtool, autoconf, automake, subunit-devel
|
||||
BuildRequires: texinfo
|
||||
Requires(post): info
|
||||
@ -53,11 +51,14 @@ programs suitable for use with the Check unit test framework.
|
||||
%if 0%{?fedora} >= 21
|
||||
%patch0 -p1 -b .info-in-builddir
|
||||
%endif
|
||||
%patch1
|
||||
autoreconf -ivf
|
||||
|
||||
# Fix detection of various time-related function declarations
|
||||
sed -i '/"ac_cv_have_decl_clock_gettime"/iac_includes_default="$ac_includes_default\n#include <time.h>\n#include <sys/time.h>"' configure
|
||||
sed -e '/DECLS(\[a/s|)|,,,[AC_INCLUDES_DEFAULT\n[#include <time.h>\n #include <sys/time.h>]]&|' \
|
||||
-e '/DECLS(\[a/s/\(getline\)\( gettimeofday\)/\1,\2/' \
|
||||
-i configure.ac
|
||||
|
||||
# Regenerate configure due to patch 0
|
||||
autoreconf -ivf
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -119,6 +120,11 @@ fi
|
||||
%{_mandir}/man1/checkmk.1*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 28 2014 Jerry James <loganjerry@gmail.com> - 0.9.14-1
|
||||
- New upstream version
|
||||
- Drop -volatile patch, no longer needed
|
||||
- Update time-related configure fix again
|
||||
|
||||
* Mon Jun 9 2014 Jerry James <loganjerry@gmail.com> - 0.9.13-2
|
||||
- Add -volatile patch to fix test failure
|
||||
- Update time-related configure fix
|
||||
|
Loading…
Reference in New Issue
Block a user