From 73d68ad37241fdbc903fecbb768054e831782d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 15 Jun 2012 15:22:19 +0100 Subject: [PATCH] probably parallel-build safe by now. Add a check for original breakage --- icu.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/icu.spec b/icu.spec index e951475..3689ded 100644 --- a/icu.spec +++ b/icu.spec @@ -1,6 +1,6 @@ Name: icu Version: 49.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT and UCD and Public Domain @@ -76,14 +76,13 @@ sed -i 's| \$(docfilesdir)/installdox||' Makefile # There is no source/doc/html/search/ directory sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile - -make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357 -make doc +make %{?_smp_mflags} +make %{?_smp_mflags} doc %install rm -rf $RPM_BUILD_ROOT source/__docs -make -C source install DESTDIR=$RPM_BUILD_ROOT -make -C source install-doc docdir=__docs +make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT +make %{?_smp_mflags} -C source install-doc docdir=__docs chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* ( cd $RPM_BUILD_ROOT%{_bindir} @@ -92,7 +91,11 @@ chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/icu-config %check -make -C source check +# test to ensure that -j(X>1) didn't "break" man pages. b.f.u #2357 +if grep -q @VERSION@ source/tools/*/*.8 source/tools/*/*.1 source/config/*.1; then + exit 1 +fi +make %{?_smp_mflags} -C source check %post -n lib%{name} -p /sbin/ldconfig @@ -148,6 +151,9 @@ make -C source check %doc source/__docs/%{name}/html/* %changelog +* Fri Jun 15 2012 Caolán McNamara - 49.1.1-3 +- probably parallel-build safe by now. Add a check for original breakage + * Fri Jun 15 2012 Caolán McNamara - 49.1.1-2 - Resolves: rhbz#804313 multi-lib pain