[packages/oracle-java8] note conflict with javaws

glen glen at pld-linux.org
Fri Jan 8 09:11:17 CET 2016


commit d402d25a443539192c3a462842ceb5af1070a876
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 8 10:11:12 2016 +0200

    note conflict with javaws

 oracle-java8.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/oracle-java8.spec b/oracle-java8.spec
index c68ca41..6e9f2ca 100644
--- a/oracle-java8.spec
+++ b/oracle-java8.spec
@@ -11,6 +11,9 @@
 # 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/oracle-java8.git/commitdiff/d402d25a443539192c3a462842ceb5af1070a876



More information about the pld-cvs-commit mailing list