probably parallel-build safe by now. Add a check for original breakage
This commit is contained in:
parent
9d36cdadd2
commit
73d68ad372
20
icu.spec
20
icu.spec
@ -1,6 +1,6 @@
|
|||||||
Name: icu
|
Name: icu
|
||||||
Version: 49.1.1
|
Version: 49.1.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: International Components for Unicode
|
Summary: International Components for Unicode
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: MIT and UCD and Public Domain
|
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
|
# There is no source/doc/html/search/ directory
|
||||||
sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile
|
sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsubsrchdir)\s*$/d' Makefile
|
||||||
|
|
||||||
|
make %{?_smp_mflags}
|
||||||
make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357
|
make %{?_smp_mflags} doc
|
||||||
make doc
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT source/__docs
|
rm -rf $RPM_BUILD_ROOT source/__docs
|
||||||
make -C source install DESTDIR=$RPM_BUILD_ROOT
|
make %{?_smp_mflags} -C source install DESTDIR=$RPM_BUILD_ROOT
|
||||||
make -C source install-doc docdir=__docs
|
make %{?_smp_mflags} -C source install-doc docdir=__docs
|
||||||
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
|
chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.*
|
||||||
(
|
(
|
||||||
cd $RPM_BUILD_ROOT%{_bindir}
|
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
|
install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/icu-config
|
||||||
|
|
||||||
%check
|
%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
|
%post -n lib%{name} -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -148,6 +151,9 @@ make -C source check
|
|||||||
%doc source/__docs/%{name}/html/*
|
%doc source/__docs/%{name}/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 15 2012 Caolán McNamara <caolanm@redhat.com> - 49.1.1-3
|
||||||
|
- probably parallel-build safe by now. Add a check for original breakage
|
||||||
|
|
||||||
* Fri Jun 15 2012 Caolán McNamara <caolanm@redhat.com> - 49.1.1-2
|
* Fri Jun 15 2012 Caolán McNamara <caolanm@redhat.com> - 49.1.1-2
|
||||||
- Resolves: rhbz#804313 multi-lib pain
|
- Resolves: rhbz#804313 multi-lib pain
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user