Hello community, here is the log from the commit of package sap-locale for openSUSE:Factory checked in at 2015-08-01 11:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sap-locale (Old) and /work/SRC/openSUSE:Factory/.sap-locale.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sap-locale" Changes: -------- --- /work/SRC/openSUSE:Factory/sap-locale/sap-locale.changes 2015-04-10 10:20:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sap-locale.new/sap-locale.changes 2015-08-01 11:37:25.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 29 12:30:07 UTC 2015 - [email protected] + +- Handle old style transliteration step + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sap-locale.spec ++++++ --- /var/tmp/diff_new_pack.6uOldx/_old 2015-08-01 11:37:26.000000000 +0200 +++ /var/tmp/diff_new_pack.6uOldx/_new 2015-08-01 11:37:26.000000000 +0200 @@ -37,8 +37,10 @@ Requires(post): sed Requires(postun): coreutils Requires(postun): sed +%if 0%{?suse_version} > 1320 # Needed for reference to __gconv_transliterate %define __filter_GLIBC_PRIVATE 1 +%endif %description This package contains all the SAP specific locales needed for running ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.6uOldx/_old 2015-08-01 11:37:26.000000000 +0200 +++ /var/tmp/diff_new_pack.6uOldx/_new 2015-08-01 11:37:26.000000000 +0200 @@ -1,3 +1,7 @@ sap-locale + targettype ia32 block + targettype 64bit block + targettype 32bit +/usr/lib/gconv/gconv-modules.SAP-32 -> /usr/lib/gconv/gconv-modules.SAP + targettype x86 +/usr/lib/gconv/gconv-modules.SAP targettype x86 obsoletes "sap-locale-32bit" targettype x86 provides "sap-locale-32bit" ++++++ sap-locale.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sap-locale/.gitignore new/sap-locale/.gitignore --- old/sap-locale/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/sap-locale/.gitignore 2015-06-29 14:22:43.000000000 +0200 @@ -0,0 +1,5 @@ +*.so +gconv/ +locale/ +locales/de_DE@HP +locales/sk_SK@SAP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sap-locale/gconvdata/iconv/loop.c new/sap-locale/gconvdata/iconv/loop.c --- old/sap-locale/gconvdata/iconv/loop.c 2015-03-31 15:19:04.000000000 +0200 +++ new/sap-locale/gconvdata/iconv/loop.c 2015-06-29 14:22:43.000000000 +0200 @@ -207,6 +207,25 @@ continue; \ } +#if __GLIBC_PREREQ (2, 21) +# define GCONV_TRANSLIT_STEP \ + if ((step_data->__flags & __GCONV_TRANSLIT) != 0) \ + result = __gconv_transliterate \ + (step, step_data, *inptrp, \ + &inptr, inend, &outptr, irreversible) +#else +# define GCONV_TRANSLIT_STEP \ + struct __gconv_trans_data *trans; \ + for (trans = step_data->__trans; trans != NULL; trans = trans->__next) \ + { \ + result = DL_CALL_FCT (trans->__trans_fct, \ + (step, step_data, trans->__data, *inptrp, \ + &inptr, inend, &outptr, irreversible)); \ + if (result != __GCONV_ILLEGAL_INPUT) \ + break; \ + } +#endif + /* Error handling for the TO_LOOP direction, with use of transliteration/ transcription functions and ignoring of errors. Note that we cannot use the do while (0) trick since `break' and `continue' must reach certain @@ -225,10 +244,7 @@ UPDATE_PARAMS; \ \ /* First try the transliteration methods. */ \ - if ((step_data->__flags & __GCONV_TRANSLIT) != 0) \ - result = __gconv_transliterate \ - (step, step_data, *inptrp, \ - &inptr, inend, &outptr, irreversible); \ + GCONV_TRANSLIT_STEP; \ \ REINIT_PARAMS; \ \
