From 0d67c801c29e007a6f7544a007cf89d4dec432f5aac8b7b972f8f04d266ea0e8 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Wed, 3 Aug 2011 14:04:43 +0000
Subject: [PATCH] Accepting request 77873 from GNOME:Factory

- Enable strict-aliasing again since the code seems to be fixed.
- Enable make check inside %check.
- Cleanup the spec file with spec-cleaner. (forwarded request 77701 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/77873
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=23
---
 icu.changes |  7 ++++++
 icu.spec    | 65 ++++++++++++++++++++++++++++++++---------------------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/icu.changes b/icu.changes
index 3309c9f..237f112 100644
--- a/icu.changes
+++ b/icu.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug  2 15:40:36 UTC 2011 - idonmez@novell.com
+
+- Enable strict-aliasing again since the code seems to be fixed.
+- Enable make check inside %check.
+- Cleanup the spec file with spec-cleaner.
+
 -------------------------------------------------------------------
 Thu May  5 10:21:40 CEST 2011 - vuntz@opensuse.org
 
diff --git a/icu.spec b/icu.spec
index 1ca4626..8fd0834 100644
--- a/icu.spec
+++ b/icu.spec
@@ -15,16 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           icu
-License:        IBM PL
-Group:          System/Libraries
 Version:        4.6.1
 Release:        1
+License:        IBM PL
 Summary:        International Components for Unicode
 Url:            http://ibm.com/software/globalization/icu
+Group:          System/Libraries
 Source0:        icu4c-4_6_1-src.tar.bz2
 Source1:        icu4c-4_6_1-docs.tar.bz2
 Source3:        SuSEconfig.icu
@@ -63,10 +62,21 @@ Group:          Development/Libraries/C and C++
 %ifarch ppc64
 Obsoletes:      libicu-64bit
 %endif
-#
-Provides:       libicu17 libicu22 libicu26 libicu30 libicu32 libicu34
-Obsoletes:      libicu17 libicu22 libicu26 libicu30 libicu32 libicu34 icu-i18ndata
 Requires:       timezone
+#
+Provides:       libicu17
+Provides:       libicu22
+Provides:       libicu26
+Provides:       libicu30
+Provides:       libicu32
+Provides:       libicu34
+Obsoletes:      icu-i18ndata
+Obsoletes:      libicu17
+Obsoletes:      libicu22
+Obsoletes:      libicu26
+Obsoletes:      libicu30
+Obsoletes:      libicu32
+Obsoletes:      libicu34
 
 %description -n libicu
 ICU is a set of C and C++ libraries that provides robust and
@@ -125,38 +135,41 @@ the `libicu%{version}' package.
 cd source
 rm -f config.cache
 %{?suse_update_config:%{suse_update_config -f }}
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 export CXXFLAGS="$CXXFLAGS -DICU_DATA_DIR='/usr/share/icu/4.0/'"
 %configure --disable-static --with-pic\
     --enable-shared \
     --without-samples
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 find . -name CVS -type d | xargs rm -rf
 cd source
-make DESTDIR=$RPM_BUILD_ROOT install
+
+%make_install
+
 # to extract debug info
-chmod a+rx $RPM_BUILD_ROOT%{_libdir}/*.so.*
+chmod a+rx %{buildroot}%{_libdir}/*.so.*
+
 # install uncompiled source data:
-mkdir -p $RPM_BUILD_ROOT/usr/share/icu/%{version}/unidata
-install -m 644 data/unidata/*.txt $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/unidata
-ln -s unidata/UnicodeData.txt $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/
-# run test suite:
-#pushd data
-#ln -sf build/*.cnv build/*.res build/*.dat build/*.brk .
-#popd
-#make check || echo "make check returned $?, ignored."
-#popd
-mkdir -p $RPM_BUILD_ROOT/sbin/conf.d/
+mkdir -p %{buildroot}%{_datadir}/icu/%{version}/unidata
+install -m 644 data/unidata/*.txt %{buildroot}/%{_datadir}/icu/%{version}/unidata
+ln -s unidata/UnicodeData.txt %{buildroot}/%{_datadir}/icu/%{version}/
+
+mkdir -p %{buildroot}/sbin/conf.d/
 sed -e "s/@ICUVERSION@/%{version}/g" < ${RPM_SOURCE_DIR}/SuSEconfig.icu > ./SuSEconfig.icu
-install -m 755 ./SuSEconfig.icu $RPM_BUILD_ROOT/sbin/conf.d/
-rm $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/license.html
-rm $RPM_BUILD_ROOT/%{_datadir}/icu/%{version}/install-sh
+install -m 755 ./SuSEconfig.icu %{buildroot}/sbin/conf.d/
+
+rm %{buildroot}/%{_datadir}/icu/%{version}/license.html
+rm %{buildroot}/%{_datadir}/icu/%{version}/install-sh
+
+%check
+cd source
+make check
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -n libicu -p /sbin/ldconfig
 
@@ -178,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/makeconv
 %{_bindir}/pkgdata
 %{_bindir}/uconv
-/usr/sbin/*
+%{_sbindir}/*
 %{_mandir}/*/*
 /sbin/conf.d/SuSEconfig.icu