[check] Drop -format patch, upstreamed. Fix detection of more time-related functions. Give checkmk its own s
Jerry James
jjames at fedoraproject.org
Mon Aug 5 15:52:34 UTC 2013
commit e17519f308c3c3a6033628d1b6aa22ba7165a003
Author: Jerry James <jamesjer at betterlinux.com>
Date: Mon Aug 5 09:52:07 2013 -0600
Drop -format patch, upstreamed.
Fix detection of more time-related functions.
Give checkmk its own subpackage for licensing reasons.
Add a check script.
check-format.patch | 39 ---------------------------------------
check.spec | 33 ++++++++++++++++++++++++++++-----
2 files changed, 28 insertions(+), 44 deletions(-)
---
diff --git a/check.spec b/check.spec
index 8a422c0..81627a5 100644
--- a/check.spec
+++ b/check.spec
@@ -37,12 +37,22 @@ Group: Development/Libraries
%description static
Static libraries of check.
+%package checkmk
+Summary: Translate concise versions of test suites into C programs
+License: BSD
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description checkmk
+The checkmk binary translates concise versions of test suites into C
+programs suitable for use with the Check unit test framework.
+
%prep
%setup -q
%patch1
-# Fix detection of localtime_r declaration
-sed -i "/localtime_r/s/ac_includes_default/&\n#include <time.h>/" configure
+# 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>"' configure
%build
%configure
@@ -52,7 +62,7 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
-i libtool
-make
+make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -60,6 +70,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+%check
+export LD_LIBRARY_PATH=$PWD/src/.libs
+make check
+
%post
/sbin/ldconfig
if [ -e %{_infodir}/%{name}.info* ]; then
@@ -83,8 +97,6 @@ fi
%files devel
%doc doc/example
-%{_bindir}/checkmk
-%{_mandir}/man1/checkmk.1*
%{_includedir}/check.h
%{_includedir}/check_stdint.h
%{_libdir}/libcheck.so
@@ -96,7 +108,18 @@ fi
%doc COPYING.LESSER
%{_libdir}/libcheck.a
+%files checkmk
+%doc checkmk/README checkmk/examples
+%{_bindir}/checkmk
+%{_mandir}/man1/checkmk.1*
+
%changelog
+* Mon Aug 5 2013 Jerry James <loganjerry at gmail.com> - 0.9.10-3
+- Drop -format patch, upstreamed
+- Fix detection of more time-related functions
+- Give checkmk its own subpackage for licensing reasons
+- Add a check script
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list