Page MenuHomeSolus
Files F11047864

D8979.id21621.diff
No OneTemporary
Actions

D8979.id21621.diff
View Options

diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,8 @@
name : openjdk-11
version : 11.0.8
-release : 1
+release : 2
source :
- http://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.8+5.tar.bz2 : 56fe2712180b6efe81bb0b9b1bbaf8abb27fc9b03213fefb91194e51a44b559f
- - https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz : 99be79935354f5c0df1ad293620ea36d13f48ec3ea870c838f20c504c9668b57
license : GPL-2.0-with-classpath-exception
component : programming.java
summary : Open implementation of Oracle's Java Development Kit
@@ -23,13 +22,11 @@
- pkgconfig(xtst)
- cups-devel
- giflib-devel
+ - openjdk-11-devel
- p7zip
setup : |
- # Unpack prebuilt tarball for bootstrap
- tar xvzf $sources/openjdk-11.0.2_linux-x64_bin.tar.gz -C $workdir
-
bash ./configure --prefix="$installdir/usr" \
- --with-boot-jdk=$workdir/jdk-11.0.2 \
+ --with-boot-jdk="/usr/lib64/openjdk-11" \
--with-version-build=10 \
--with-version-pre="" \
--with-version-opt="" \
@@ -46,18 +43,28 @@
build : |
make images
install : |
- install -Ddm 00755 $installdir/%libdir% $installdir/usr/include/openjdk-11 $installdir/usr/share/man/man1
+ install -Ddm 00755 $installdir/%libdir%/
+ mkdir -p $installdir/usr/include/openjdk-11/ $installdir/usr/share/applications/
+
make install
# Binaries
- mv $installdir/usr/jvm/openjdk-%version% $installdir/%libdir%/openjdk-11
- rm -rf $installdir/usr/jvm
- rm -rf $installdir/usr/bin
+ mv $installdir/usr/jvm/openjdk-%version% $installdir/%libdir%/openjdk-11/
+ rm -rf $installdir/usr/jvm/
+ rm -rf $installdir/usr/bin/
+
+ # Headers
+ cd build/linux-x86_64-normal-server-release/
+ cp -ar jdk/include/* $installdir/usr/include/openjdk-11/
+ # Symlink header files (because some apps look for them in $JAVA_HOME)
+ ln -s /usr/include/openjdk-11/ $installdir/usr/lib64/openjdk-11/include/
- # Headers and man pages
- cd build/linux-x86_64-normal-server-release
- cp -ar jdk/include/* $installdir/usr/include/openjdk-11/.
- mv $installdir/usr/lib64/openjdk-11/man/man1/*.1 $installdir/usr/share/man/man1/
+ # Man pages
+ mv $installdir/usr/lib64/openjdk-11/man/ $installdir/usr/share/
+ find $installdir/usr/share/man/ -type f -exec rename -- ".1" "-11.1" {} \;
+ # Remove pre-existing symlink first
+ rm $installdir/usr/share/man/ja
+ mv -f $installdir/usr/share/man/ja_JP.UTF-8/ $installdir/usr/share/man/ja/
# Add java-11-jar.desktop into usable apps
- install -Dm 00644 $pkgfiles/java-11-jar.desktop $installdir/usr/share/applications/java-11-jar.desktop
+ install -Dm 00644 $pkgfiles/java-11-jar.desktop $installdir/usr/share/applications/
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -225,6 +225,7 @@
<Path fileType="library">/usr/lib64/openjdk-11/include/jvmticmlr.h</Path>
<Path fileType="library">/usr/lib64/openjdk-11/include/linux/jawt_md.h</Path>
<Path fileType="library">/usr/lib64/openjdk-11/include/linux/jni_md.h</Path>
+ <Path fileType="library">/usr/lib64/openjdk-11/include/openjdk-11</Path>
<Path fileType="library">/usr/lib64/openjdk-11/jmods/java.base.jmod</Path>
<Path fileType="library">/usr/lib64/openjdk-11/jmods/java.compiler.jmod</Path>
<Path fileType="library">/usr/lib64/openjdk-11/jmods/java.datatransfer.jmod</Path>
@@ -633,60 +634,58 @@
<Path fileType="library">/usr/lib64/openjdk-11/lib/server/libjvm.so</Path>
<Path fileType="library">/usr/lib64/openjdk-11/lib/src.zip</Path>
<Path fileType="library">/usr/lib64/openjdk-11/lib/tzdb.dat</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jar.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jarsigner.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/java.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/javac.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/javadoc.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/javap.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jcmd.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jconsole.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jdb.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jdeps.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jinfo.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jjs.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jmap.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jps.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jrunscript.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jstack.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jstat.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jstatd.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/keytool.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/pack200.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/rmic.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/rmid.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/rmiregistry.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/serialver.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/unpack200.1</Path>
- <Path fileType="library">/usr/lib64/openjdk-11/man/man1</Path>
<Path fileType="library">/usr/lib64/openjdk-11/release</Path>
<Path fileType="data">/usr/share/applications/java-11-jar.desktop</Path>
- <Path fileType="man">/usr/share/man/man1/jar.1</Path>
- <Path fileType="man">/usr/share/man/man1/jarsigner.1</Path>
- <Path fileType="man">/usr/share/man/man1/java.1</Path>
- <Path fileType="man">/usr/share/man/man1/javac.1</Path>
- <Path fileType="man">/usr/share/man/man1/javadoc.1</Path>
- <Path fileType="man">/usr/share/man/man1/javap.1</Path>
- <Path fileType="man">/usr/share/man/man1/jcmd.1</Path>
- <Path fileType="man">/usr/share/man/man1/jconsole.1</Path>
- <Path fileType="man">/usr/share/man/man1/jdb.1</Path>
- <Path fileType="man">/usr/share/man/man1/jdeps.1</Path>
- <Path fileType="man">/usr/share/man/man1/jinfo.1</Path>
- <Path fileType="man">/usr/share/man/man1/jjs.1</Path>
- <Path fileType="man">/usr/share/man/man1/jmap.1</Path>
- <Path fileType="man">/usr/share/man/man1/jps.1</Path>
- <Path fileType="man">/usr/share/man/man1/jrunscript.1</Path>
- <Path fileType="man">/usr/share/man/man1/jstack.1</Path>
- <Path fileType="man">/usr/share/man/man1/jstat.1</Path>
- <Path fileType="man">/usr/share/man/man1/jstatd.1</Path>
- <Path fileType="man">/usr/share/man/man1/keytool.1</Path>
- <Path fileType="man">/usr/share/man/man1/pack200.1</Path>
- <Path fileType="man">/usr/share/man/man1/rmic.1</Path>
- <Path fileType="man">/usr/share/man/man1/rmid.1</Path>
- <Path fileType="man">/usr/share/man/man1/rmiregistry.1</Path>
- <Path fileType="man">/usr/share/man/man1/serialver.1</Path>
- <Path fileType="man">/usr/share/man/man1/unpack200.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jar-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jarsigner-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/java-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/javac-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/javadoc-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/javap-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jcmd-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jconsole-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jdb-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jdeps-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jinfo-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jjs-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jmap-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jps-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jrunscript-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jstack-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jstat-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/jstatd-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/keytool-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/pack200-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/rmic-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/rmid-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/rmiregistry-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/serialver-11.1</Path>
+ <Path fileType="man">/usr/share/man/ja/man1/unpack200-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jar-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jarsigner-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/java-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/javac-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/javadoc-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/javap-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jcmd-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jconsole-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jdb-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jdeps-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jinfo-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jjs-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jmap-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jps-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jrunscript-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jstack-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jstat-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/jstatd-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/keytool-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/pack200-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/rmic-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/rmid-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/rmiregistry-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/serialver-11.1</Path>
+ <Path fileType="man">/usr/share/man/man1/unpack200-11.1</Path>
</Files>
</Package>
<Package>
@@ -696,7 +695,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="1">openjdk-11</Dependency>
+ <Dependency release="2">openjdk-11</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/openjdk-11/classfile_constants.h</Path>
@@ -709,8 +708,8 @@
</Files>
</Package>
<History>
- <Update release="1">
- <Date>2020-05-30</Date>
+ <Update release="2">
+ <Date>2020-06-03</Date>
<Version>11.0.8</Version>
<Comment>Packaging update</Comment>
<Name>Campbell Jones</Name>

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:54 PM (3 h, 5 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5818217
Default Alt Text
D8979.id21621.diff (12 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.