packages (AC-branch): java-sun/java-sun.spec - more HEAD merge bits
glen
glen at pld-linux.org
Sat Oct 1 13:12:29 CEST 2011
Author: glen Date: Sat Oct 1 11:12:29 2011 GMT
Module: packages Tag: AC-branch
---- Log message:
- more HEAD merge bits
---- Files affected:
packages/java-sun:
java-sun.spec (1.246.2.1.2.2 -> 1.246.2.1.2.3)
---- Diffs:
================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.246.2.1.2.2 packages/java-sun/java-sun.spec:1.246.2.1.2.3
--- packages/java-sun/java-sun.spec:1.246.2.1.2.2 Sat Oct 1 13:10:00 2011
+++ packages/java-sun/java-sun.spec Sat Oct 1 13:12:23 2011
@@ -771,14 +771,14 @@
%attr(755,root,root) %{jredir}/lib/%{arch}/native_threads
%dir %{jredir}/lib/%{arch}/server
%attr(755,root,root) %{jredir}/lib/%{arch}/server/*
-%dir %{jredir}/lib/%{arch}/jli
-%attr(755,root,root) %{jredir}/lib/%{arch}/jli/libjli.so
-%dir %{jredir}/lib/%{arch}/headless
-%attr(755,root,root) %{jredir}/lib/%{arch}/headless/libmawt.so
%ifarch %{ix86}
%dir %{jredir}/lib/%{arch}/client
%attr(755,root,root) %{jredir}/lib/%{arch}/client/*
%endif
+%dir %{jredir}/lib/%{arch}/jli
+%attr(755,root,root) %{jredir}/lib/%{arch}/jli/libjli.so
+%dir %{jredir}/lib/%{arch}/headless
+%attr(755,root,root) %{jredir}/lib/%{arch}/headless/libmawt.so
%attr(755,root,root) %{jredir}/lib/%{arch}/lib*.so
%exclude %{jredir}/lib/%{arch}/libjavaplugin*.so
@@ -978,6 +978,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.246.2.1.2.3 2011/10/01 11:12:23 glen
+- more HEAD merge bits
+
Revision 1.246.2.1.2.2 2011/10/01 11:10:00 glen
- up to 1.6.0.27
- merged 1.278..1.281 from head
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.246.2.1.2.2&r2=1.246.2.1.2.3&f=u
More information about the pld-cvs-commit
mailing list