Hello community, here is the log from the commit of package icu for openSUSE:Factory checked in at 2013-07-29 17:41:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-16 07:35:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.icu.new/icu.changes 2013-07-29 17:41:53.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 23 18:00:11 UTC 2013 - jeng...@inai.de + +- Add missing symlinks and update description in icu-versioning.diff + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu.spec ++++++ --- /var/tmp/diff_new_pack.vMmwqv/_old 2013-07-29 17:41:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vMmwqv/_new 2013-07-29 17:41:54.000000000 +0200 @@ -149,11 +149,18 @@ # does as few as possible, but that means we need some additional # cleanup in the spec file now. # -for i in "$b/%_libdir"/*.so.[0-9]*; do +pushd "$b/%_libdir/" +for i in *.so.[0-9]*; do + echo "Looking at $i" if [ "${i##*.so.}" != "%version" ]; then - rm -fv "$i"; + rm -fv "$i" + continue fi + # Because U_ICU_VERSION_SHORT is "51_2" and not "51.2", + # create some symlinks. + ln -s "$i" "${i%%%version}%aversion" done +popd # /usr/lib/rpm/elfdeps requires +x bit and not all had it at one point chmod a+rx "$b/%_libdir"/lib*.so.* ++++++ icu-versioning.diff ++++++ --- /var/tmp/diff_new_pack.vMmwqv/_old 2013-07-29 17:41:54.000000000 +0200 +++ /var/tmp/diff_new_pack.vMmwqv/_new 2013-07-29 17:41:54.000000000 +0200 @@ -9,6 +9,25 @@ Thus, we will use the full version as the SO identifier in openSUSE. +Details: + +U_ICU_VERSION_SHORT was (example) "49" before when there was a +libicui18n.so.49. Now, since there is a libicui18n.so.51.2, we need to +change U_ICU_VERSION_SHORT. But the define's documentation says +"without dots", and I do not know how much downstream code depends on +the non-dot feature, if at all. Anyhow, to bypass this question to +which we have no definite answer, U_ICU_VERSION_SHORT is instead simply +defined to "51_2" and we "fix" (read like: hack) it with symlinks. + +However, the ICU source also uses U_ICU_VERSION_SHORT to construct the +path to its data files. However, as there is no "icudt51_2l.dat", but +only a "icudt51l.dat", U_ICU_VERSION_MAJOR_STR is introduced for +ICU-internal use, so that I do not have to edit more dirty Makefiles to +produce a "icudt51_2l.dat" instead. In fact, placing the version number +in "icudt51l" seems redundant, since that file is in a version-specific +directory anyway (/usr/share/icu/51.2/) — another point where ICU +development seems to not pay enough attention. + --- source/common/icuplug.c | 2 +- source/common/umapfile.c | 6 +++--- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org