[icu] Resolves: rhbz#856594 include content of icu/source/uconfig.h.prepend
Eike Rathke
erack at fedoraproject.org
Mon Jan 28 19:57:12 UTC 2013
commit aec29f734f1b9835ec542797f67397ba36e20149
Author: Eike Rathke <erack at redhat.com>
Date: Mon Jan 28 20:26:10 2013 +0100
Resolves: rhbz#856594 include content of icu/source/uconfig.h.prepend
icu.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/icu.spec b/icu.spec
index 40bb99d..5be6f51 100644
--- a/icu.spec
+++ b/icu.spec
@@ -1,6 +1,6 @@
Name: icu
Version: 50.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: International Components for Unicode
Group: Development/Tools
License: MIT and UCD and Public Domain
@@ -82,6 +82,10 @@ sed -i 's|^LIBS =.*|LIBS = -nostdlib -L../../lib -licui18n -licuuc -lpthread -lc
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
+# rhbz#856594 The configure --disable-renaming and possibly other options
+# result in icu/source/uconfig.h.prepend being created, include that content in
+# 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
make %{?_smp_mflags}
make %{?_smp_mflags} doc
@@ -159,6 +163,9 @@ make %{?_smp_mflags} -C source check
%doc source/__docs/%{name}/html/*
%changelog
+* Mon Jan 28 2013 Eike Rathke <erack at redhat.com> - 50.1.2-2
+- Resolves: rhbz#856594 include content of icu/source/uconfig.h.prepend
+
* Fri Jan 25 2013 Eike Rathke <erack at redhat.com> - 50.1.2-1
- Update to 50.1.2
- Resolves: rhbz#856594 to-do add --disable-renaming on next soname bump
More information about the scm-commits
mailing list