From bfd8c323cda0bccbdb3989ee008fd15eee7017aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Feb 2019 11:14:41 +0100 Subject: minor cleanup --- icu-last.spec | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/icu-last.spec b/icu-last.spec index cbaecfe..1e2d4db 100644 --- a/icu-last.spec +++ b/icu-last.spec @@ -1,4 +1,13 @@ -#%%global debugtrace 1 +# remirepo spec file for icu62 +# renamed for parallel installation, from: +# +# Fedora spec file for icu +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# %global srcname icu %global soname 62 @@ -10,23 +19,19 @@ Name: icu%{soname} Version: %{soname}.1 Release: 3%{?dist} Summary: International Components for Unicode -Group: Development/Tools License: MIT and UCD and Public Domain URL: http://site.icu-project.org/ Source0: http://download.icu-project.org/files/icu4c/%{soname}.1/icu4c-%{soname}_1-src.tgz Source1: icu-config.sh -%if 0%{?rhel} == 6 -BuildRequires: doxygen, autoconf268, python -%else -BuildRequires: doxygen, autoconf, python2 -%endif +BuildRequires: doxygen, autoconf >= 2.69, python2 BuildRequires: gcc BuildRequires: gcc-c++ Requires: lib%{name}%{?_isa} = %{version}-%{release} -Conflicts: %{srcname} < %{version} -Provides: %{srcname} = %{version}-%{release} +Conflicts: %{srcname}-last < %{version} +Conflicts: %{srcname} < %{version} +Provides: %{srcname} = %{version}-%{release} Patch4: gennorm2-man.patch Patch5: icuinfo-man.patch @@ -52,7 +57,7 @@ results across all the various platforms you support, without sacrificing performance. It offers great flexibility to extend and customize the supplied services. -This package is designed to be installable %{name}. +This package is designed to be installable beside lib%{srcname}. %package -n lib%{name}-devel Summary: Development files for International Components for Unicode @@ -70,8 +75,9 @@ Includes and definitions for developing with icu. Summary: Documentation for International Components for Unicode Group: Documentation BuildArch: noarch -Conflicts: lib%{srcname}-doc < %{version} -Provides: lib%{srcname}-doc = %{version}-%{release} +Conflicts: lib%{srcname}-last-doc < %{version} +Conflicts: lib%{srcname}-doc < %{version} +Provides: lib%{srcname}-doc = %{version}-%{release} %description -n lib%{name}-doc %{summary}. @@ -91,11 +97,7 @@ Provides: lib%{srcname}-doc = %{version}-%{release} %build pushd source -%if 0%{?rhel} == 6 -autoconf268 -%else autoconf -%endif CFLAGS='%optflags -fno-strict-aliasing' CXXFLAGS='%optflags -fno-strict-aliasing' # Endian: BE=0 LE=1 @@ -214,7 +216,7 @@ LD_LIBRARY_PATH=lib:stubdata:tools/ctestfw:$LD_LIBRARY_PATH bin/uconv -l %changelog -* Wed Feb 7 2019 Pavel Podkorytov - 62.1-3 +* Thu Feb 7 2019 Pavel Podkorytov - 62.1-3 - backport FEDORA-29 changes - rename "libicu-last" to "libicu62" -- cgit