Hello community, here is the log from the commit of package icu for openSUSE:Factory checked in at 2014-08-01 07:07:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu (Old) and /work/SRC/openSUSE:Factory/.icu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu" Changes: -------- --- /work/SRC/openSUSE:Factory/icu/icu.changes 2014-04-09 13:01:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icu.new/icu.changes 2014-08-01 07:07:57.000000000 +0200 @@ -1,0 +2,37 @@ +Tue Jul 29 19:44:47 UTC 2014 - [email protected] + +- add baselibs.conf as source + +------------------------------------------------------------------- +Mon Jun 16 08:31:20 UTC 2014 - [email protected] + +- add icu-fix-tests-depending-on-date.patch to fix build + see http://sourceforge.net/p/icu/mailman/message/32443311/ + +------------------------------------------------------------------- +Tue Jun 3 13:23:12 UTC 2014 - [email protected] + +- Ensure we escape the find %f properly. + +------------------------------------------------------------------- +Tue Jun 3 11:35:25 UTC 2014 - [email protected] + +- Version bump to 53.1: + * Data from the CLDR 25 release: Many bug fixes + * Time zone data: 2014b, including post CLDR 25 time zone data + update to CLDR. + * U+20BD Ruble Sign added (from Unicode 7.0, otherwise ICU 53 + still uses Unicode 6.3) + * Collation code re-implemented + * ICU4C now requires compilers with C99 support + * Updated Spoof Checker for Unicode Security Standard version + 6.3. (#10706) + * many more see http://site.icu-project.org/download/53 + +------------------------------------------------------------------- +Tue Jun 3 11:00:20 UTC 2014 - [email protected] + +- Clean up with spec-cleaner and remove some obsolete provide/obsolete +- Use official download tarballs instead of repacks + +------------------------------------------------------------------- Old: ---- icu4c-52_1-docs.tar.xz icu4c-52_1-src.tar.xz New: ---- icu-fix-tests-depending-on-date.patch icu4c-53_1-docs.zip icu4c-53_1-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu.spec ++++++ --- /var/tmp/diff_new_pack.zVzlJe/_old 2014-08-01 07:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.zVzlJe/_new 2014-08-01 07:08:00.000000000 +0200 @@ -16,28 +16,29 @@ # +%define lname libicu53_1 +%define aversion 53_1 Name: icu -%define lname libicu52_1 -Version: 52.1 +Version: 53.1 Release: 0 -%define aversion 52_1 Summary: International Components for Unicode License: MIT Group: Development/Libraries/C and C++ Url: http://icu-project.org/ -#DL-URL: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz -Source: icu4c-%aversion-src.tar.xz -Source2: icu4c-%aversion-docs.tar.xz +Source: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-src.tgz +Source2: http://download.icu-project.org/files/icu4c/%version/icu4c-%aversion-docs.zip Source3: sanitize_docs.sh +Source100: baselibs.conf Patch1: icu-rpmlint.diff Patch2: icu-remove-datetime.patch Patch3: icu-versioning.diff Patch4: icu-fix-install-mode-files.diff +Patch5: icu-fix-tests-depending-on-date.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRequires: xz +BuildRequires: unzip BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,16 +55,11 @@ %package -n %lname Summary: International Components for Unicode Group: System/Libraries -%ifarch ppc64 -# bug437293 -Obsoletes: libicu-64bit -%endif +Requires: libicu%aversion-data Requires: timezone -Obsoletes: icu-i18ndata # Following O/P added in timeframe for 12.2 -Provides: libicu = %version-%release -Obsoletes: libicu < %version-%release -Requires: libicu%aversion-data +Provides: libicu = %version +Obsoletes: libicu < %version %description -n %lname ICU is a set of C and C++ libraries that provides robust and @@ -88,10 +84,6 @@ %package -n libicu-devel Summary: International Components for Unicode (development files) Group: Development/Libraries/C and C++ -%ifarch ppc64 -# bug437293 -Obsoletes: libicu-devel-64bit -%endif Requires: %lname = %version %description -n libicu-devel @@ -122,34 +114,42 @@ This package contains uncompiled source data. %prep -%setup -qn icu -a2 -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%setup -q -n icu +# docs are special +mkdir html +cd html +unzip %SOURCE2 +cd .. + +%patch -P 1 -P 2 -P 3 -P 4 -p1 -P 5 -p1 %build cd source -export CXXFLAGS="%optflags -DICU_DATA_DIR=\\\"/usr/share/icu/%version/\\\"" +export CXXFLAGS="%optflags -DICU_DATA_DIR=\\\"%_datadir/icu/%version/\\\"" export CFLAGS="$CXXFLAGS" -%configure --disable-static --enable-shared --disable-samples \ +%configure \ + --disable-static \ + --enable-shared \ + --disable-samples \ --with-data-packaging=archive -make %{?_smp_mflags} +make %{?_smp_mflags} VERBOSE=1 %install -b="%buildroot" -mkdir -p "$b/%_docdir/%name" -cp -a html "$b/%_docdir/%name/" -cp -a license.html readme.html "$b/%_docdir/%name/" +mkdir -p "%buildroot/%_docdir/%name" +cp -a html "%buildroot/%_docdir/%name/" +cp -a license.html readme.html "%buildroot/%_docdir/%name/" find . -name CVS -type d -exec rm -Rf "{}" "+" cd source -make install DESTDIR="$b"; +make install DESTDIR="%buildroot" # # ICU's "pkgdata" utility is really fragile, so icu-versioning.diff # does as few as possible, but that means we need some additional # cleanup in the spec file now. # -pushd "$b/%_libdir/" +pushd "%buildroot/%_libdir/" for i in *.so.[0-9]*; do echo "Looking at $i" if [ "${i##*.so.}" != "%version" ]; then @@ -163,33 +163,32 @@ popd # /usr/lib/rpm/elfdeps requires +x bit and not all had it at one point -chmod a+rx "$b/%_libdir"/lib*.so.* +chmod a+rx "%buildroot/%_libdir"/lib*.so.* # install uncompiled source data: -mkdir -p "$b/%_datadir/icu/%version/unidata" -install -m 644 data/unidata/*.txt "$b/%_datadir/icu/%version/unidata" -ln -s unidata/UnicodeData.txt "$b/%_datadir/icu/%version/" +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/" -rm "$b/%_datadir/icu/%version/license.html" -rm "$b/%_datadir/icu/%version/install-sh" +rm "%buildroot/%_datadir/icu/%version/license.html" +rm "%buildroot/%_datadir/icu/%version/install-sh" %fdupes %buildroot/%_prefix %check -#ln source/data/in/icudt51l.dat source/data/in/icudt%{version}l.dat cd source %if !0%{?qemu_user_space_build:1} # Checks disabled in qemu because of races happening when we emulate # multi-threaded programs, and some check tests atomic instructions in # multi-threaded icu invocations -ICU_DATA="%buildroot/%_datadir/icu/%version" make check VERBOSE=1 +ICU_DATA="%buildroot/%_datadir/icu/%version" make check %{?_smp_mflags} VERBOSE=1 %endif +%post # This should be run by whatever owns /usr/lib64/icu - # the (main) package in this case -%post if test -d "%_libdir/icu"; then - current=$(cd "%_libdir/icu/"; find [0-9]* -maxdepth 1 -type d -printf '%f\n' | + current=$(cd "%_libdir/icu/"; find [0-9]* -maxdepth 1 -type d -printf '%%f\n' | sort -V | tail -n1); if test -n "$current"; then rm -f "%_libdir/icu/current"; @@ -199,7 +198,7 @@ %postun if test -d "%_libdir/icu"; then - current=$(cd "%_libdir/icu/"; find [0-9]* -maxdepth 1 -type d -printf '%f\n' | + current=$(cd "%_libdir/icu/"; find [0-9]* -maxdepth 1 -type d -printf '%%f\n' | sort -V | tail -n1); if test -n "$current"; then rm -f "%_libdir/icu/current"; @@ -208,6 +207,7 @@ fi; %post -n %lname -p /sbin/ldconfig + %postun -n %lname -p /sbin/ldconfig %files @@ -235,7 +235,7 @@ %defattr(-,root,root) %dir %_datadir/icu %dir %_datadir/icu/%version -%_datadir/icu/%version/icudt52[bl].dat +%_datadir/icu/%version/icudt5*[bl].dat %files -n libicu-devel %defattr(-, root, root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.zVzlJe/_old 2014-08-01 07:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.zVzlJe/_new 2014-08-01 07:08:00.000000000 +0200 @@ -1,4 +1,4 @@ -libicu52_1 +libicu53_1 libicu-devel requires -libicu-<targettype> - requires "libicu52_1-<targettype> = <version>" + requires "libicu53_1-<targettype> = <version>" ++++++ icu-fix-tests-depending-on-date.patch ++++++ See icu-fix-tests-depending-on-date.patch Index: icu/source/test/intltest/dtfmttst.cpp =================================================================== --- icu.orig/source/test/intltest/dtfmttst.cpp +++ icu/source/test/intltest/dtfmttst.cpp @@ -1132,7 +1132,7 @@ DateFormatTest::TestTwoDigitYear() return; } parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5)); - parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4)); + parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4)); } // ------------------------------------- ++++++ icu-rpmlint.diff ++++++ --- /var/tmp/diff_new_pack.zVzlJe/_old 2014-08-01 07:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.zVzlJe/_new 2014-08-01 07:08:00.000000000 +0200 @@ -14,9 +14,9 @@ Index: icu/source/tools/pkgdata/pkgdata.cpp =================================================================== ---- icu.orig/source/tools/pkgdata/pkgdata.cpp -+++ icu/source/tools/pkgdata/pkgdata.cpp -@@ -1914,12 +1914,12 @@ static void loadLists(UPKGOptions *o, UE +--- icu.orig/source/tools/pkgdata/pkgdata.cpp 2014-06-03 13:07:41.342876943 +0200 ++++ icu/source/tools/pkgdata/pkgdata.cpp 2014-06-03 13:08:45.537882879 +0200 +@@ -2069,12 +2069,12 @@ const char cmd[] = "icu-config --incpkgdatafile"; /* #1 try the same path where pkgdata was called from. */ @@ -27,7 +27,7 @@ - uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024); + uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf)); } -- uprv_strncat(cmdBuf, cmd, 1024); +- uprv_strncat(cmdBuf, cmd, 1023); + uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf)); if(verbose) { ++++++ icu-versioning.diff ++++++ --- /var/tmp/diff_new_pack.zVzlJe/_old 2014-08-01 07:08:00.000000000 +0200 +++ /var/tmp/diff_new_pack.zVzlJe/_new 2014-08-01 07:08:00.000000000 +0200 @@ -104,8 +104,8 @@ @@ -58,6 +58,7 @@ * @stable ICU 2.4 */ - #define U_ICU_VERSION_MAJOR_NUM 52 -+#define U_ICU_VERSION_MAJOR_STR "52" + #define U_ICU_VERSION_MAJOR_NUM 53 ++#define U_ICU_VERSION_MAJOR_STR "53" /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU @@ -113,7 +113,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SUFFIX _52 +-#define U_ICU_VERSION_SUFFIX _53 +#define ___icu_version_expand(major, minor) _ ## major ## _ ## minor +#define ___icu_version_glue(major, minor) ___icu_version_expand(major, minor) +#define U_ICU_VERSION_SUFFIX ___icu_version_glue(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM) @@ -124,8 +124,8 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ --#define U_ICU_VERSION_SHORT "52" -+#define U_ICU_VERSION_SHORT "52_1" +-#define U_ICU_VERSION_SHORT "53" ++#define U_ICU_VERSION_SHORT "53_1" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
