Reviewer needed - fix in font configuration files handling in RHELs

[Deepak Bhole]

* Pavel Tisnovsky <ptisnovs at redhat.com> [2011-06-09 11:59]:
> Hi all,
> 
> I prepared IcedTea6 (HEAD) patch which fixes font configuration files
> handling in RHELs (5, 6). In the original version of patched class, both
>  major and minor OS version ("5.6" for example) is read from
> /etc/redhat-release and then this string is used during searching for
> font configuration file. It means that each RHEL subversion needs their
> own font configuration file, which is not needed at this moment (ie 6.0
> and 6.1 configuration is the same).
> 
> hg diff containing patch + Makefile.am changes is stored in an attachment.
> 

Patch looks okay to me! I think it should be backported to 1.9/1.10 as
well, as there are still RHEL versions using those.

Cheers,
Deepak

> Here's ChangeLog entry:
> 
> 2011-06-09  Pavel Tisnovsky  <ptisnovs at redhat.com>
> 
>         * Makefile.am: Added new patch
>         * patches/fonts-rhel-version.patch:
>         Patch which ensures, that only one fontconfig file
>         will be needed on particular RHEL version
>         (ie. only one file for RHEL 6.0, RHEL 6.1 and RHEL 6.2)
> 
> Can anybody please review this patch?
> 
> Thank you in advance,
> Pavel

> diff -r e191909a7c6e Makefile.am
> --- a/Makefile.am	Mon May 30 19:21:44 2011 +0100
> +++ b/Makefile.am	Thu Jun 09 16:54:45 2011 +0200
> @@ -339,7 +339,8 @@
>  	patches/openjdk/7034464-hugepage.patch \
>  	patches/openjdk/7037939-hugepage.patch \
>  	patches/openjdk/7043564-hugepage.patch \
> -	patches/openjdk/mutter.patch
> +	patches/openjdk/mutter.patch \
> +	patches/fonts-rhel-version.patch
>  
>  if WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r e191909a7c6e patches/fonts-rhel-version.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/fonts-rhel-version.patch	Thu Jun 09 16:54:45 2011 +0200
> @@ -0,0 +1,33 @@
> +--- openjdk-orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	2011-06-09 16:04:24.000000000 +0200
> ++++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java	2011-06-09 16:04:24.000000000 +0200
> +@@ -169,7 +169,9 @@
> +                     osVersion = getVersionString(f);
> +                 } else if ((f = new File("/etc/redhat-release")).canRead()) {
> +                     osName = "RedHat";
> +-                    osVersion = getVersionString(f);
> ++                    // At this time we don't need to distinguish
> ++                    // between RHEL 6.0 and RHEL 6.1 for example.
> ++                    osVersion = getMajorVersionString(f);
> +                 } else if ((f = new File("/etc/turbolinux-release")).canRead()) {
> +                     osName = "Turbo";
> +                     osVersion = getVersionString(f);
> +@@ -208,6 +210,19 @@
> +         return null;
> +     }
> + 
> ++    /**
> ++     * Gets the OS major version string from a Linux release-specific file.
> ++     */
> ++    private String getMajorVersionString(File f){
> ++        try {
> ++            Scanner sc  = new Scanner(f);
> ++            return sc.findInLine("(\\d)+");
> ++        }
> ++        catch (Exception e){
> ++        }
> ++        return null;
> ++    }
> ++
> +     private static final String fontsDirPrefix = "$JRE_LIB_FONTS";
> + 
> +     protected String mapFileName(String fileName) {