From 498cc00a3d7268119269642f514b78e4ff997b2d Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Mon, 29 Dec 2008 16:40:14 +0000 Subject: [PATCH] Resolves rhbz#225896 clean up low hanging rpmlint warnings --- icu.spec | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/icu.spec b/icu.spec index 64d71e1..9c88b44 100644 --- a/icu.spec +++ b/icu.spec @@ -1,20 +1,20 @@ Name: icu Version: 4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: International Components for Unicode Group: Development/Tools License: MIT URL: http://www.icu-project.org/ Source0: http://download.icu-project.org/files/icu4c/4.0/icu4c-4_0-src.tgz +Source1: icu-config BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, autoconf -Patch1: icu-config -Patch2: icu-3.4-multiarchdevel.patch -Patch3: icu.icuXXXX.virama.prevnext.patch -Patch4: icu.icu6008.arm.padding.patch -Patch5: icu.icu6213.worstcase.patch -Patch6: icu.icu6284.strictalias.patch +Patch1: icu-3.4-multiarchdevel.patch +Patch2: icu.icuXXXX.virama.prevnext.patch +Patch3: icu.icu6008.arm.padding.patch +Patch4: icu.icu6213.worstcase.patch +Patch5: icu.icu6284.strictalias.patch %description Tools and utilities for developing with icu. @@ -53,16 +53,18 @@ Group: Documentation %prep %setup -q -n %{name} -%patch2 -p1 -b .multiarchdevel -%patch3 -p1 -b .icuXXXX.virama.prevnext.patch -%patch4 -p1 -b .icu6008.arm.padding.patch -%patch5 -p1 -b .icu6213.worstcase.patch -%patch6 -p1 -b .icu6284.strictalias.patch +%patch1 -p1 -b .multiarchdevel +%patch2 -p1 -b .icuXXXX.virama.prevnext.patch +%patch3 -p1 -b .icu6008.arm.padding.patch +%patch4 -p1 -b .icu6213.worstcase.patch +%patch5 -p1 -b .icu6284.strictalias.patch %build cd source autoconf %configure --with-data-packaging=library --disable-samples +#rhbz#225896 +sed -i -- "s/-nodefaultlibs -nostdlib//" config/mh-linux make # %{?_smp_mflags} # -j(X>1) may "break" man pages as of 3.2, b.f.u #2357 make doc @@ -71,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT source/__docs make -C source install DESTDIR=$RPM_BUILD_ROOT make -C source install-doc docdir=__docs chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so.* -cp -p %{PATCH1} $RPM_BUILD_ROOT%{_bindir}/%{name}-config +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-config chmod a+x $RPM_BUILD_ROOT%{_bindir}/%{name}-config sed -i s/\\\$\(THREADSCXXFLAGS\)// $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc sed -i s/\\\$\(THREADSCPPFLAGS\)/-D_REENTRANT/ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/icu.pc @@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT %doc source/__docs/%{name}/html/* %changelog +* Mon Dec 29 2008 Caolan McNamara - 4.0-6 +- Resolves rhbz#225896 clean up low hanging rpmlint warnings + * Tue Dec 16 2008 Caolan McNamara - 4.0-5 - drop integrated icu.icu5557.safety.patch