/[packages]/updates/5/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec
ViewVC logotype

Diff of /updates/5/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 894245 by luigiwalser, Wed Sep 23 19:25:15 2015 UTC revision 894246 by luigiwalser, Thu Oct 22 17:45:14 2015 UTC
# Line 107  Line 107 
107  %global with_systemtap 0  %global with_systemtap 0
108  %endif  %endif
109    
110    # AArch64 currently uses a different OpenJDK source tarball
111    %ifarch %{aarch64}
112    %global openjdk_sourceid 1
113    %else
114    %global openjdk_sourceid 0
115    %endif
116    
117  # Convert an absolute path to a relative path.  Each symbolic link is  # Convert an absolute path to a relative path.  Each symbolic link is
118  # specified relative to the directory in which it is installed so that  # specified relative to the directory in which it is installed so that
119  # it will resolve properly within chrooted installations.  # it will resolve properly within chrooted installations.
# Line 116  Line 123 
123    
124  # Standard JPackage naming and versioning defines.  # Standard JPackage naming and versioning defines.
125  %global origin          openjdk  %global origin          openjdk
126  %global updatever       60  %global updatever       65
127  %global buildver        b27  %global buildver        b17
128  %global aarch64_updatever 60  %global aarch64_updatever 65
129  %global aarch64_buildver b24.2  %global aarch64_buildver b17
130  %global aarch64_changesetid aarch64-jdk8u%{aarch64_updatever}-%{aarch64_buildver}  %global aarch64_changesetid aarch64-jdk8u%{aarch64_updatever}-%{aarch64_buildver}
131  # priority must be 7 digits in total  # priority must be 7 digits in total
132  %global priority        18000%{updatever}  %global priority        18000%{updatever}
# Line 182  if [ "$1" -gt 1 ]; then Line 189  if [ "$1" -gt 1 ]; then
189    # This is the md5sum of an unmodified java.security file    # This is the md5sum of an unmodified java.security file
190    if [ "${sum}" = '1690ac33955594f71dc952c9e83fd396' -o \\    if [ "${sum}" = '1690ac33955594f71dc952c9e83fd396' -o \\
191         "${sum}" = 'b138695d0c0ea947e64a21a627d973ba' -o \\         "${sum}" = 'b138695d0c0ea947e64a21a627d973ba' -o \\
192         "${sum}" = 'd17958676bdb9f9d941c8a59655311fb' ]; then         "${sum}" = 'd17958676bdb9f9d941c8a59655311fb' -o \\
193           "${sum}" = '5463aef7dbf0bbcfe79e0336a7f92701' -o \\
194           "${sum}" = '400cc64d4dd31f36dc0cc2c701d603db' ]; then
195      if [ -f "${javasecurity}.rpmnew" ]; then      if [ -f "${javasecurity}.rpmnew" ]; then
196        mv -f "${javasecurity}.rpmnew" "${javasecurity}"        mv -f "${javasecurity}.rpmnew" "${javasecurity}"
197      fi      fi
# Line 676  Group:   Development/Java Line 685  Group:   Development/Java
685  License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C  License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and LGPL+ and LGPLv2 and MPLv1.0 and MPLv1.1 and Public Domain and W3C
686  URL:      http://openjdk.java.net/  URL:      http://openjdk.java.net/
687    
688  # Source from upstrem OpenJDK8 project. To regenerate, use  # Sources from internal security patched trees.
689  # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver}  # ./generate_local_tarball.sh <path to 8u65 sources> jdk8u%%{updatever}-%%{buildver}
690  # ./generate_source_tarball.sh aarch64-port jdk8 %%{aarch64_hg_tag}  # ./generate_local_tarball.sh <path to aarch64-port 8u65 sources> %%{aarch64_changesetid}
691  Source0:  jdk8u60-jdk8u%{updatever}-%{buildver}.tar.xz  Source0:  jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
692  Source1:  jdk8-%{aarch64_changesetid}.tar.xz  Source1:  jdk8u-%{aarch64_changesetid}.tar.xz
693    
694  # Custom README for -src subpackage  # Custom README for -src subpackage
695  Source2:  README.src  Source2:  README.src
# Line 981  if [ %{include_debug_build} -eq 0 -a  %{ Line 990  if [ %{include_debug_build} -eq 0 -a  %{
990    echo "you have disabled both include_debug_build and include_debug_build. no go."    echo "you have disabled both include_debug_build and include_debug_build. no go."
991    exit 13    exit 13
992  fi  fi
993  %setup -q -c -n %{uniquesuffix ""} -T -a 0  %setup -q -c -n %{uniquesuffix ""} -T -a %{openjdk_sourceid}
994  # https://bugzilla.redhat.com/show_bug.cgi?id=1189084  # https://bugzilla.redhat.com/show_bug.cgi?id=1189084
995  prioritylength=`expr length %{priority}`  prioritylength=`expr length %{priority}`
996  if [ $prioritylength -ne 7 ] ; then  if [ $prioritylength -ne 7 ] ; then
997   echo "priority must be 7 digits in total, violated"   echo "priority must be 7 digits in total, violated"
998   exit 14   exit 14
999  fi  fi
 # For old patches  
 # Swap HotSpot for AArch64 port  
 %ifarch %{aarch64}  
 #pushd openjdk  
 #rm -r hotspot  
 # tmp - containing whole aarch64 forest  
 rm -r openjdk  
 tar xf %{SOURCE1}  
 #popd  
 %endif  
1000  ln -s openjdk jdk8  ln -s openjdk jdk8
1001    
1002  cp %{SOURCE2} .  cp %{SOURCE2} .
# Line 1160  bash ../../configure \ Line 1159  bash ../../configure \
1159      --with-libjpeg=system \      --with-libjpeg=system \
1160      --with-giflib=system \      --with-giflib=system \
1161      --with-libpng=system \      --with-libpng=system \
1162      --with-lcms=system \      --with-lcms=bundled \
1163      --with-stdc++lib=dynamic \      --with-stdc++lib=dynamic \
1164      --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \      --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
1165      --with-extra-cflags="$EXTRA_CFLAGS" \      --with-extra-cflags="$EXTRA_CFLAGS" \
Legend:
Removed from v.894245  
changed lines
  Added in v.894246
  ViewVC Help
Powered by ViewVC 1.1.30