packages: java5-sun/java5-sun.spec - fixed %files

pawelz pawelz at pld-linux.org
Sat Apr 24 00:22:27 CEST 2010


Author: pawelz                       Date: Fri Apr 23 22:22:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed %files

---- Files affected:
packages/java5-sun:
   java5-sun.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/java5-sun/java5-sun.spec
diff -u packages/java5-sun/java5-sun.spec:1.16 packages/java5-sun/java5-sun.spec:1.17
--- packages/java5-sun/java5-sun.spec:1.16	Sun Apr 18 10:28:59 2010
+++ packages/java5-sun/java5-sun.spec	Sat Apr 24 00:22:21 2010
@@ -458,10 +458,8 @@
 %doc COPYRIGHT LICENSE README.html THIRDPARTYLICENSEREADME.txt
 %{_jvmdir}/java
 %{_jvmjardir}/java
-%ifarch %{ix86}
 %attr(755,root,root) %{_bindir}/HtmlConverter
 %attr(755,root,root) %{_bindir}/java-rmi.cgi
-%endif
 %attr(755,root,root) %{_bindir}/extcheck
 %attr(755,root,root) %{_bindir}/idlj
 %attr(755,root,root) %{_bindir}/jarsigner
@@ -689,8 +687,10 @@
 %{jredir}/lib/management/jmxremote.password.template
 %{jredir}/lib/management/management.properties
 %{jredir}/lib/management/snmp.acl.template
+%ifarch %{ix86}
 %dir %{jredir}/lib/deploy
 %{jredir}/lib/deploy/ffjcext.zip
+%endif
 %dir %{jredir}/lib/servicetag
 %{jredir}/lib/servicetag/jdk_header.png
 
@@ -752,6 +752,8 @@
 %dir %{jredir}/lib/i386/motif21
 %attr(755,root,root) %{jredir}/lib/i386/awt_robot
 %attr(755,root,root) %{jredir}/lib/i386/libjavaplugin*.so
+%attr(755,root,root) %{jredir}/lib/i386/motif21/libmawt.so
+%attr(755,root,root) %{jredir}/lib/i386/xawt/libmawt.so
 %endif
 %ifarch %{x8664}
 %dir %{jredir}/lib/amd64
@@ -761,9 +763,6 @@
 %endif
 %ifarch %{ix86}
 %{jvmjardir}/javaws.jar
-%endif
-%attr(755,root,root) %{jredir}/lib/i386/motif21/libmawt.so
-%attr(755,root,root) %{jredir}/lib/i386/xawt/libmawt.so
 %dir %{jredir}/lib/javaws
 %{jredir}/lib/javaws/Java1.5.ico
 %{jredir}/lib/javaws/messages.properties
@@ -778,6 +777,7 @@
 %{jredir}/lib/javaws/messages_zh_HK.properties
 %{jredir}/lib/javaws/messages_zh_TW.properties
 %{jredir}/lib/javaws/miniSplash.jpg
+%endif
 %ifarch %{x8664}
 %attr(755,root,root) %{jredir}/lib/amd64/motif21/libmawt.so
 %attr(755,root,root) %{jredir}/lib/amd64/xawt/libmawt.so
@@ -789,8 +789,8 @@
 
 %files jre-X11
 %defattr(644,root,root,755)
-%ifarch %{ix86}
 %attr(755,root,root) %{_bindir}/ControlPanel
+%ifarch %{ix86}
 %attr(755,root,root) %{jredir}/bin/java_vm
 %endif
 %attr(755,root,root) %{_bindir}/policytool
@@ -891,6 +891,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/04/23 22:22:21  pawelz
+- fixed %files
+
 Revision 1.16  2010/04/18 08:28:59  jajcus
 - \%{_jvmdir} symlinks fixed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java5-sun/java5-sun.spec?r1=1.16&r2=1.17&f=u



More information about the pld-cvs-commit mailing list