/[packages]/cauldron/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec

Diff of /cauldron/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec

Parent Directory | Revision Log | View Patch Patch

-revision 645254 by ovitters,
Sun Jul  6 12:41:40 2014 UTC
+revision 659708 by luigiwalser,
Mon Aug  4 21:58:20 2014 UTC
 Line 1
  # If debug is 1, OpenJDK is built with all debug info present.
  %global debug 0
- %global jdk8_version b132
- %global hg_tag jdk8-%{jdk8_version}
  %global aarch64_hg_tag  992
  %global aarch64         aarch64 arm64 armv8
  %global multilib_arches %{power64} sparc64 x86_64 %{aarch64}
  %global jit_arches      %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
+ # sometimes we need to distinguish big and little endian PPC64
+ # taken from the openjdk-1.7 spec
+ %global ppc64le                 ppc64le
+ %global ppc64be                 ppc64 ppc64p7
  %ifarch x86_64
  %global archinstall amd64
-Line 19
+Line 21
  %ifarch %{power64}
  %global archinstall ppc64
  %endif
+ %ifarch %{ppc64le}
+ %global archinstall ppc64le
+ %endif
  %ifarch %{ix86}
  %global archinstall i386
  %endif
-Line 84
+Line 89
  # Standard JPackage naming and versioning defines.
  %global origin          openjdk
- %global updatever       0
+ %global updatever       11
- %global buildver        %{jdk8_version}
+ %global buildver        b12
  %global aarch64_updatever 0
  %global aarch64_buildver b128
  # priority must be 6 digits in total
-Line 130
+Line 135
  Name:    java-%{javaver}-%{origin}
  Version: %{javaver}.%{updatever}
- Release: %mkrel 2.%{buildver}.3
+ Release: %mkrel 3.%{buildver}.0
  # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
  # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
  # also included the epoch in their virtual provides.  This created a
-Line 148 
 License:  ASL 1.1 and ASL 2.0 and GPL+ a
+Line 153 
 License:  ASL 1.1 and ASL 2.0 and GPL+ a
  URL:      http://openjdk.java.net/
  # Source from upstrem OpenJDK8 project. To regenerate, use
- # ./generate_source_tarball.sh jdk8 %{hg_tag}
+ # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver}
- # ./generate_source_tarball.sh aarch64-port %{aarch64_hg_tag}
+ # ./generate_source_tarball.sh aarch64-port jdk8 %{aarch64_hg_tag}
- Source0:  jdk8-%{hg_tag}.tar.xz
+ Source0:  jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
- Source1:  aarch64-port-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz
+ Source1:  aarch64-hotspot-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz
  # Custom README for -src subpackage
  Source2:  README.src
-Line 196 
 Patch4: PStack-808293.patch
+Line 201 
 Patch4: PStack-808293.patch
  Patch5: multiple-pkcs11-library-init.patch
  # Disable doclint for compatibility
  Patch6: disable-doclint-by-default.patch
+ # Include all sources in src.zip
+ Patch7: include-all-srcs.patch
+ # Fix window activation in gnome-shell
+ Patch8: set-active-window.patch
+ # Fix javadoc. Backport from upstream.
+ Patch9: javadoc-error-jdk-8029145.patch
+ # More javadoc. Backport from upstream.
+ Patch10: javadoc-error-jdk-8037484.patch
+ # Problem discovered with make 4.0
+ Patch11: hotspot-build-j-directive.patch
  #
  # OpenJDK specific patches
-Line 204 
 Patch6: disable-doclint-by-default.patch
+Line 219 
 Patch6: disable-doclint-by-default.patch
  # Allow icedtea-web to build
  Patch99: applet-hole.patch
- # Recognize s390/s390x
+ # JVM heap size changes for s390 (thanks to aph)
- Patch100: %{name}-s390.patch
+ Patch100: %{name}-s390-java-opts.patch
  # Type fixing for s390
- Patch101: %{name}-bitmap.patch
  Patch102: %{name}-size_t.patch
  # Patch for PPC/PPC64
-Line 217 
 Patch201: system-libjpeg.patch
+Line 231 
 Patch201: system-libjpeg.patch
  Patch202: system-libpng.patch
  Patch203: system-lcms.patch
- Patch1000: java-1.8.0-fix-build.patch
+ Patch999:  0001-PPC64LE-arch-support-in-openjdk-1.8.patch
+ Patch9999: enableArm64.patch
  BuildRequires: autoconf
  BuildRequires: automake
  BuildRequires: alsa-lib-devel
+ BuildRequires: binutils
  BuildRequires: cups-devel
  BuildRequires: desktop-file-utils
  BuildRequires: fontconfig
-Line 232 
 BuildRequires: gtk2-devel
+Line 248 
 BuildRequires: gtk2-devel
  BuildRequires: lcms2-devel
  BuildRequires: libjpeg-devel
  BuildRequires: libpng-devel
- #BuildRequires: libxslt
+ BuildRequires: libxslt-devel
  BuildRequires: libx11-devel
  BuildRequires: libxi-devel
  BuildRequires: libxinerama-devel
-Line 242 
 BuildRequires: pkgconfig
+Line 258 
 BuildRequires: pkgconfig
  BuildRequires: x11-proto-devel
  #BuildRequires: redhat-lsb
  BuildRequires: zip
- # OpenJDK X officially requires OpenJDK (X-1) to build
+ BuildRequires: java-1.8.0-openjdk-devel
- BuildRequires: java-1.7.0-openjdk-devel
  # Zero-assembler build requirement.
  %ifnarch %{jit_arches}
  BuildRequires: libffi-devel
-Line 253 
 BuildRequires: libffi-devel
+Line 268 
 BuildRequires: libffi-devel
  BuildRequires: openssl
  # execstack build requirement.
  # no prelink on ARM yet
- %ifnarch %{arm} %{aarch64}
+ %ifnarch %{arm} %{aarch64} %{ppc64le}
  BuildRequires: prelink
  %endif
  %if %{with_systemtap}
  BuildRequires: systemtap
  %endif
+ Requires: fontconfig
+ #Requires: x11-font-type1
  # Requires rest of java
  Requires: %{name}-headless = %{epoch}:%{version}-%{release}
-Line 274 
 Provides: java = %{epoch}:%{javaver}
+Line 292 
 Provides: java = %{epoch}:%{javaver}
  # Standard JPackage extensions provides.
  Provides: java-fonts = %{epoch}:%{version}
+ #Obsoletes: java-1.7.0-openjdk < 1:1.7.0.65-2.5.1.2
+ #Provides:  java-1.7.0-openjdk = %{epoch}:%{version}-%{release}
  %description
  The OpenJDK runtime environment.
-Line 314 
 Provides: jce = %{epoch}:%{version}
+Line 335 
 Provides: jce = %{epoch}:%{version}
  Provides: jdbc-stdext = 4.1
  Provides: java-sasl = %{epoch}:%{version}
+ #Obsoletes: java-1.7.0-openjdk-headless < 1:1.7.0.65-2.5.1.2
+ #Provides: java-1.7.0-openjdk-headless = %{epoch}:%{version}-%{release}
  %description headless
  The OpenJDK runtime environment without audio and video support.
-Line 338 
 Provides: java-%{javaver}-devel = %{epoc
+Line 362 
 Provides: java-%{javaver}-devel = %{epoc
  Provides: java-devel-%{origin} = %{epoch}:%{version}
  Provides: java-devel = %{epoch}:%{javaver}
+ #Obsoletes: java-1.7.0-openjdk-devel < 1:1.7.0.65-2.5.1.2
+ #Provides: java-1.7.0-openjdk-devel = %{epoch}:%{version}-%{release}
  %description devel
  The OpenJDK development tools.
-Line 348 
 Group:   Development/Java
+Line 374 
 Group:   Development/Java
  Requires: %{name} = %{epoch}:%{version}-%{release}
+ #Obsoletes: java-1.7.0-openjdk-demo < 1:1.7.0.65-2.5.1.2
+ #Provides: java-1.7.0-openjdk-demo = %{epoch}:%{version}-%{release}
  %description demo
  The OpenJDK demos.
-Line 357 
 Group:   Development/Java
+Line 386 
 Group:   Development/Java
  Requires: %{name} = %{epoch}:%{version}-%{release}
+ #Obsoletes: java-1.7.0-openjdk-src < 1:1.7.0.65-2.5.1.2
+ #Provides: java-1.7.0-openjdk-src = %{epoch}:%{version}-%{release}
  %description src
  The OpenJDK source bundle.
-Line 375 
 Requires(postun): %{_sbindir}/alternativ
+Line 407 
 Requires(postun): %{_sbindir}/alternativ
  Provides: java-javadoc = %{epoch}:%{version}-%{release}
  Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
+ #Obsoletes: java-1.7.0-openjdk-javadoc < 1:1.7.0.65-2.5.1.2
+ #Provides: java-1.7.0-openjdk-javadoc = %{epoch}:%{version}-%{release}
  %description javadoc
  The OpenJDK API documentation.
-Line 384 
 Summary: OpenJDK accessibility connector
+Line 419 
 Summary: OpenJDK accessibility connector
  Requires: java-atk-wrapper
  Requires: %{name} = %{epoch}:%{version}-%{release}
+ #Obsoletes: java-1.7.0-openjdk-accessibility < 1:1.7.0.65-2.5.1.2
+ #Provides: java-1.7.0-openjdk-accessibility = %{epoch}:%{version}-%{release}
  %description accessibility
  Enables accessibility support in OpenJDK by using java-atk-wrapper. This allows
  compatible at-spi2 based accessibility programs to work for AWT and Swing-based
-Line 396 
 need to.
+Line 434 
 need to.
  %prep
+ %setup -q -c -n %{name} -T -a 0
  %ifarch %{aarch64}
- %global source_num 1
+ pushd jdk8
- %else
+ rm -r hotspot
- %global source_num 0
+ tar xf %{SOURCE1}
+ popd
  %endif
- %setup -q -c -n %{name} -T -a %{source_num}
  cp %{SOURCE2} .
  # replace outdated configure guess script
-Line 417 
 cp %{SOURCE101} jdk8/common/autoconf/bui
+Line 455 
 cp %{SOURCE101} jdk8/common/autoconf/bui
  # Remove libraries that are linked
  sh %{SOURCE12}
+ %ifarch %{aarch64}
+ %patch9999
+ %endif
  %patch201
  %patch202
  %patch203
-Line 428 
 sh %{SOURCE12}
+Line 470 
 sh %{SOURCE12}
  %patch4
  %patch5
  %patch6
+ %patch7
+ %patch8
+ %patch9
+ %patch10
+ %patch11
  %patch99
- # Type fixes for s390
+ # s390 build fixes
- %ifarch s390 s390x
+ %ifarch s390
  %patch100
- %patch101
  %patch102
  %endif
  %ifarch ppc %{power64}
  # PPC fixes
  %patch103
+ %patch999 -p1
  %endif
- %patch1000 -p1
  # Extract systemtap tapsets
  %if %{with_systemtap}
-Line 499 
 bash ../../configure \
+Line 544 
 bash ../../configure \
  %ifnarch %{jit_arches}
      --with-jvm-variants=zero \
  %endif
- %ifarch %{aarch64}
-     --with-jvm-variants=client \
-     --disable-precompiled-headers \
- %endif
      --disable-zip-debug-info \
      --with-milestone="fcs" \
  %ifnarch %{aarch64}
+     --with-update-version=%{updatever} \
      --with-build-number=%{buildver} \
  %else
      --with-build-number=%{aarch64_buildver} \
-Line 520 
 bash ../../configure \
+Line 562 
 bash ../../configure \
      --with-libpng=system \
      --with-lcms=system \
      --with-stdc++lib=dynamic \
-     --with-num-cores="$NUM_PROC"
+     --with-num-cores="$NUM_PROC" \
+     --with-extra-cflags="-fno-devirtualize" \
+     --with-extra-cxxflags="-fno-devirtualize"
  # The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
  # disables FDS for all build configs and reverts to pre-FDS make logic.
-Line 528 
 bash ../../configure \
+Line 572 
 bash ../../configure \
  # ignore all the other logic about which debug options and just do '-g'.
  make \
-     SCTP_WERROR= \
      DEBUG_BINARIES=true \
-     FULL_DEBUG_SYMBOLS=0 \
+     STRIP_POLICY=no_strip \
-     STRIP_POLICY=none \
+     POST_STRIP_CMD="" \
-     ALT_OBJCOPY=/does_not_exist \
      LOG=trace \
      all
-Line 558 
 chmod 755 $JAVA_HOME/jre/bin/java
+Line 600 
 chmod 755 $JAVA_HOME/jre/bin/java
  # Copy tz.properties
  echo "sun.zoneinfo.dir=/usr/share/javazi" >> $JAVA_HOME/jre/lib/tz.properties
+ # Use system-wide tzdata
+ #rm $JAVA_HOME/jre/lib/tzdb.dat
+ #ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat
  # Check unlimited policy has been used
  $JAVA_HOME/bin/javac -d . %{SOURCE13}
  $JAVA_HOME/bin/java TestCryptoLevel
+ # Check debug symbols are present and can identify code
+ SERVER_JVM="$JAVA_HOME/jre/lib/%{archinstall}/server/libjvm.so"
+ if [ -f "$SERVER_JVM" ] ; then
+   nm -aCl "$SERVER_JVM" | grep javaCalls.cpp
+ fi
+ CLIENT_JVM="$JAVA_HOME/jre/lib/%{archinstall}/client/libjvm.so"
+ if [ -f "$CLIENT_JVM" ] ; then
+   nm -aCl "$CLIENT_JVM" | grep javaCalls.cpp
+ fi
+ ZERO_JVM="$JAVA_HOME/jre/lib/%{archinstall}/zero/libjvm.so"
+ if [ -f "$ZERO_JVM" ] ; then
+   nm -aCl "$ZERO_JVM" | grep javaCalls.cpp
+ fi
  %install
+ rm -rf $RPM_BUILD_ROOT
  STRIP_KEEP_SYMTAB=libjvm*
  # Install symlink to default soundfont
-Line 759 
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
+Line 819 
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
      echo "" >> accessibility.properties
    popd
- %post
+ %post headless
- update-desktop-database %{_datadir}/applications &> /dev/null || :
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
- exit 0
  # FIXME: identical binaries are copied, not linked. This needs to be
  # fixed upstream.
- %post headless
+ ext=%{_extension}
- ext=.xz
  alternatives \
    --install %{_bindir}/java java %{jrebindir}/java %{priority} \
    --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
-Line 814 
 alternatives \
+Line 869 
 alternatives \
    --slave %{_jvmjardir}/jre-%{javaver} \
    jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
- update-desktop-database %{_datadir}/applications &> /dev/null || :
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
- exit 0
- %postun
- update-desktop-database %{_datadir}/applications &> /dev/null || :
- if [ $1 -eq 0 ] ; then
-     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- fi
  exit 0
  %postun headless
-Line 838 
 then
+Line 879 
 then
    alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
  fi
- %posttrans
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
  %post devel
- ext=.xz
+ ext=%{_extension}
  alternatives \
    --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
    --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
-Line 949 
 alternatives \
+Line 987 
 alternatives \
    --slave %{_jvmjardir}/java-%{javaver} \
    java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
- update-desktop-database %{_datadir}/applications &> /dev/null || :
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
  exit 0
  %postun devel
-Line 985 
 exit 0
+Line 1020 
 exit 0
  %files headless -f %{name}.files-headless
+ %defattr(-,root,root,-)
  %doc %{buildoutputdir}/images/j2sdk-image/jre/ASSEMBLY_EXCEPTION
  %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
  %doc %{buildoutputdir}/images/j2sdk-image/jre/THIRD_PARTY_README
-Line 1015 
 exit 0
+Line 1051 
 exit 0
  %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
  %files devel
+ %defattr(-,root,root,-)
  %doc %{buildoutputdir}/images/j2sdk-image/ASSEMBLY_EXCEPTION
  %doc %{buildoutputdir}/images/j2sdk-image/LICENSE
  %doc %{buildoutputdir}/images/j2sdk-image/THIRD_PARTY_README
-Line 1069 
 exit 0
+Line 1106 
 exit 0
  %endif
  %files demo -f %{name}-demo.files
+ %defattr(-,root,root,-)
  %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
  %files src
+ %defattr(-,root,root,-)
  %doc README.src
  %{_jvmdir}/%{sdkdir}/src.zip
  %files javadoc
+ %defattr(-,root,root,-)
  %doc %{_javadocdir}/%{name}
  %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
-Line 1084 
 exit 0
+Line 1124 
 exit 0
  %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
  %{_jvmdir}/%{jredir}/lib/accessibility.properties

 Legend:



Removed from v.645254
 


changed lines


 
Added in v.659708
 Legend:



Removed from v.645254
 


changed lines


 
Added in v.659708
-Removed from v.645254
+Added in v.659708

	ViewVC Help
Powered by ViewVC 1.1.30