rpms/icu
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#856594 roll back and build without --disable-renaming again

Browse Source
This commit is contained in:
Eike Rathke 2013-01-29 10:46:59 +01:00
parent aec29f734f
commit e530a83e14
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu.spec
View File

@ -1,6 +1,6 @@
Name: icu Name: icu
Version: 50.1.2 Version: 50.1.2
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
@ -68,7 +68,8 @@ CXXFLAGS='%optflags -fno-strict-aliasing'
%if ! 0%{?endian} %if ! 0%{?endian}
CPPFLAGS='-DU_IS_BIG_ENDIAN=1' CPPFLAGS='-DU_IS_BIG_ENDIAN=1'
%endif %endif
%configure --with-data-packaging=library --disable-samples --disable-renaming #rhbz856594 do not use --disable-renaming or cope with the mess
%configure --with-data-packaging=library --disable-samples
#rhbz#225896 #rhbz#225896
sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux sed -i 's|-nodefaultlibs -nostdlib||' config/mh-linux
#rhbz#681941 #rhbz#681941
@ -85,7 +86,7 @@ sed -i '/^\s\+\$(INSTALL_DATA) \$(docsrchfiles) \$(DESTDIR)\$(docdir)\/\$(docsub
# rhbz#856594 The configure --disable-renaming and possibly other options # rhbz#856594 The configure --disable-renaming and possibly other options
# result in icu/source/uconfig.h.prepend being created, include that content in # result in icu/source/uconfig.h.prepend being created, include that content in
# icu/source/common/unicode/uconfig.h to propagate to consumer packages. # icu/source/common/unicode/uconfig.h to propagate to consumer packages.
sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' -i common/unicode/uconfig.h test -f uconfig.h.prepend && sed -e '/^#define __UCONFIG_H__/ r uconfig.h.prepend' -i common/unicode/uconfig.h
make %{?_smp_mflags} make %{?_smp_mflags}
make %{?_smp_mflags} doc make %{?_smp_mflags} doc
@ -163,6 +164,9 @@ make %{?_smp_mflags} -C source check
%doc source/__docs/%{name}/html/* %doc source/__docs/%{name}/html/*
%changelog %changelog
* Tue Jan 29 2013 Eike Rathke <erack@redhat.com> - 50.1.2-3
- Resolves: rhbz#856594 roll back and build without --disable-renaming again
* Mon Jan 28 2013 Eike Rathke <erack@redhat.com> - 50.1.2-2 * Mon Jan 28 2013 Eike Rathke <erack@redhat.com> - 50.1.2-2
- Resolves: rhbz#856594 include content of icu/source/uconfig.h.prepend - Resolves: rhbz#856594 include content of icu/source/uconfig.h.prepend