From 85248ddb482d97b2de79b19fcfda7cf8f37c4ef43e8b5540f582794b75d08156 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 20 Aug 2017 19:47:36 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=231

---
 java-1_8_0-openjdk.spec | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 916d91c..c88e6ac 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -170,7 +170,7 @@ Name:           java-1_8_0-openjdk
 Version:        %{javaver}.%{updatever}
 Release:        0
 Summary:        OpenJDK 8 Runtime Environment
-License:        Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C
+License:        Apache-1.1 AND Apache-2.0 AND GPL-1.0+ AND GPL-2.0 AND GPL-2.0-with-classpath-exception AND LGPL-2.0 AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C
 Group:          Development/Languages/Java
 Url:            http://openjdk.java.net/
 Source0:        http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar.xz
@@ -258,7 +258,6 @@ Provides:       jre1.5.x
 Provides:       jre1.6.x
 Provides:       jre1.7.x
 Provides:       jre1.8.x
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with bootstrap}
 BuildRequires:  java-bootstrap-devel >= 1.7.0
 %else
@@ -1059,20 +1058,20 @@ if [ ! -e %{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar ]; then
 fi
 
 %files -f %{name}.files
-%defattr(-,root,root)
 %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}
 %dir %{_datadir}/icons/hicolor
 %{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png
 
 %files headless -f %{name}.files-headless
-%defattr(-,root,root,-)
 %dir %{_jvmdir}
 %dir %{_jvmdir}/%{jredir}/
 %dir %{_jvmdir}/%{jredir}/bin
 %dir %{_jvmdir}/%{jredir}/lib
 %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}
 %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/jli
+%ifnarch %{arm}
 %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/server
+%endif
 %dir %{_jvmdir}/%{jredir}/lib/cmm
 %dir %{_jvmdir}/%{jredir}/lib/desktop
 %dir %{_jvmdir}/%{jredir}/lib/ext
@@ -1117,7 +1116,6 @@ fi
 %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
 
 %files devel
-%defattr(-,root,root,-)
 %dir %{_jvmdir}/%{sdkdir}/bin
 %dir %{_jvmdir}/%{sdkdir}/include
 %dir %{_jvmdir}/%{sdkdir}/lib
@@ -1168,20 +1166,16 @@ fi
 %endif
 
 %files demo -f %{name}-demo.files
-%defattr(-,root,root,-)
 
 %files src
-%defattr(-,root,root,-)
 %{_jvmdir}/%{sdkdir}/src.zip
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %dir %{_javadocdir}
 %dir %{_javadocdir}/%{sdklnk}
 %{_javadocdir}/%{sdklnk}/*
 
 %files accessibility
-%defattr(-,root,root)
 %dir %{_jvmdir}/%{jredir}/lib/ext
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/accessibility.properties
 %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so