subpackage deps broken (x11)

[packages/oracle-java8.git] / oracle-java8.spec

diff --git a/oracle-java8.spec b/oracle-java8.spec
index 9415fe0c525aad515b809bc41cb9e2d542128294..80f3dc9353f4856ed3d1de3a3110557a1f491068 100644 (file)
--- a/oracle-java8.spec
+++ b/oracle-java8.spec
@@ -1,4 +1,6 @@
 # NOTE
+#  - jre-base should not pull X11 deps:
+#      oracle-java8-jre-base-1.8.0.112-1.x86_64 marks gtk+2-2.24.31-1.x86_64 (cap libgdk-x11-2.0.so.0()(64bit))
 #  - early access packages downloadable: http://jdk6.java.net/download.html
 #  - sample/demo available as separate download, licensesd with Oracle BSD license
 #       /usr/lib/jvm/java8-1.7.0.11/jre/lib/i386/libjavaplugin_jni.so
@@ -11,21 +13,24 @@
 # warning: File(s) packaged into both browser-plugin-oracle-java8-1.8.0.45-1.i686 and browser-plugin-oracle-java8-ng-1.8.0.45-1.i686:
 #        /usr/lib/jvm/java8-1.8.0.45/jre/plugin/desktop/sun_java.desktop
 #        /usr/lib/jvm/java8-1.8.0.45/jre/plugin/desktop/sun_java.png
+# - subpackage or obsolete/provide?:
+#        file /usr/bin/javaws from install of icedtea-web-1.6.1-1.x86_64 conflicts with file from package oracle-java8-jre-X11-1.8.0.66-1.x86_64
+#        file /usr/share/man/man1/javaws.1.gz from install of icedtea-web-1.6.1-1.x86_64 conflicts with file from package oracle-java8-jre-X11-1.8.0.66-1.x86_64
 #
 # Conditional build:
 %bcond_without tests           # build without tests
 
 # disable file duplicate packaging error
 %define                _duplicate_files_terminate_build   0
-%define                src_ver 8u60
-%define                bld_ver b27
-%define                dir_ver %(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
+%define                src_ver 8u112
+%define                bld_ver b15
+%define                dir_ver %(echo %{version} | sed 's/\\.\\([^.]\\+\\)$/_\\1/')
 # class data version seen with file(1) that this jvm is able to load
 %define                _classdataversion 52.0
 Summary:       Oracle JDK (Java Development Kit) for Linux
 Summary(pl.UTF-8):     Oracle JDK - środowisko programistyczne Javy dla Linuksa
 Name:          oracle-java8
-Version:       1.8.0.60
+Version:       1.8.0.112
 Release:       1
 License:       restricted, distributable
 # http://www.oracle.com/technetwork/java/javase/terms/license/index.html
@@ -35,10 +40,10 @@ Group:              Development/Languages/Java
 # Download URL (requires JavaScript and interactive license agreement):
 # http://www.oracle.com/technetwork/java/javase/downloads/index.html
 Source0:       http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{bld_ver}/jdk-%{src_ver}-linux-i586.tar.gz
-# NoSource0-md5:       a46d706babbd63f459d7ca6d4057d80f
+# NoSource0-md5:       66ccf8e7c28969d56863034d030134bf
 NoSource:      0
 Source1:       http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{bld_ver}/jdk-%{src_ver}-linux-x64.tar.gz
-# NoSource1-md5:       b8ca513d4f439782c019cb78cd7fd101
+# NoSource1-md5:       de9b7a90f0f5a13cfcaa3b01451d0337
 NoSource:      1
 Source2:       Test.java
 Source3:       Test.class
@@ -488,7 +493,7 @@ cp -a jre/plugin $RPM_BUILD_ROOT%{jredir}
 
 # Install plugin for browsers
 # Plugin in regular location simply does not work (is seen by browsers):
-%ifarch %{ix86}
+%ifarch 0
 ln -sf %{jredir}/plugin/%{arch}/ns7/libjavaplugin_oji.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 %endif
 ln -sf %{jredir}/lib/%{arch}/libnpjp2.so $RPM_BUILD_ROOT%{_browserpluginsdir}
@@ -539,15 +544,18 @@ ln -s java8-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/jre
 ln -s java8-%{version} $RPM_BUILD_ROOT%{_jvmjardir}/jsse
 
 # ugly hack for libavplugin.so
-cp -p $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-54.so \
-       $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-56.so
+cp -p $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-56.so \
+       $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-57.so
 %{__sed} -i -e '
-       s#\.so\.54#.so.56#g
-       s#LIBAVFORMAT_54#LIBAVFORMAT_56#g
-       s#LIBAVCODEC_54#LIBAVCODEC_56#g
-' $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-56.so
+       s#\.so\.56#.so.57#g
+       s#LIBAVFORMAT_56#LIBAVFORMAT_57#g
+       s#LIBAVCODEC_56#LIBAVCODEC_57#g
+' $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-57.so
 rm $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-53.so
 rm $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-54.so
+rm $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-55.so
+rm $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-56.so
+rm $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-ffmpeg-56.so
 
 # modify RPATH so that javac and friends are able to work when /proc is not
 # mounted and we can't append to RPATH (for example to keep previous lookup
@@ -561,7 +569,7 @@ rm $RPM_BUILD_ROOT%{jredir}/lib/%{arch}/libavplugin-54.so
 chrpath -d $RPM_BUILD_ROOT%{jredir}/bin/unpack200
 
 fixrpath() {
-       execlist=$(find $RPM_BUILD_ROOT%{javadir} -type f -perm +1 | xargs file | awk -F: '/ELF.*executable/{print $1}')
+       execlist=$(find $RPM_BUILD_ROOT%{javadir} -type f -executable | xargs file | awk -F: '/ELF.*executable/{print $1}')
        for f in $execlist; do
                rpath=$(chrpath -l $f | awk '/(R|RUN)PATH=/ { gsub(/.*RPATH=/,""); gsub(/.*RUNPATH=/,""); gsub(/:/," "); print $0 }')
                [ "$rpath" ] || continue
@@ -865,7 +873,7 @@ fi
 %exclude %{jredir}/lib/%{arch}/libjfx*.so
 %exclude %{jredir}/lib/%{arch}/libprism_*.so
 %exclude %{jredir}/lib/%{arch}/libfxplugins.so
-%exclude %{jredir}/lib/%{arch}/libavplugin-56.so
+%exclude %{jredir}/lib/%{arch}/libavplugin-57.so
 
 %{jredir}/lib/deploy
 %{jredir}/lib/desktop
@@ -967,7 +975,7 @@ fi
 
 %files javafx
 %defattr(644,root,root,755)
-%attr(755,root,root) %{jredir}/lib/%{arch}/libavplugin-56.so
+%attr(755,root,root) %{jredir}/lib/%{arch}/libavplugin-57.so
 %attr(755,root,root) %{jredir}/lib/%{arch}/libfxplugins.so
 %attr(755,root,root) %{jredir}/lib/%{arch}/libglass.so
 %attr(755,root,root) %{jredir}/lib/%{arch}/libgstreamer-lite.so
@@ -1020,7 +1028,7 @@ fi
 %lang(ja) %{_mandir}/ja/man1/rmic.1*
 %lang(ja) %{_mandir}/ja/man1/rmiregistry.1*
 
-%ifarch %{ix86}
+%if 0
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
 %dir %{jredir}/plugin