packages: java-sun/java-sun.spec - libnpjp2.so was also packaged twice, in ...

[glen]

Author: glen                         Date: Thu Sep  2 16:41:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libnpjp2.so was also packaged twice, in plugin and in jre-base package
  take different approach, list all and exclude, instead of playing with alphabet

---- Files affected:
packages/java-sun:
   java-sun.spec (1.270 -> 1.271) 

---- Diffs:

================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.270 packages/java-sun/java-sun.spec:1.271
--- packages/java-sun/java-sun.spec:1.270	Thu Sep  2 18:28:01 2010
+++ packages/java-sun/java-sun.spec	Thu Sep  2 18:41:45 2010
@@ -806,14 +806,17 @@
 %dir %{jredir}/lib/%{arch}/jli
 %attr(755,root,root) %{jredir}/lib/%{arch}/native_threads
 %attr(755,root,root) %{jredir}/lib/%{arch}/server
-%attr(755,root,root) %{jredir}/lib/%{arch}/jli/libjli.so
-%{jredir}/lib/%{arch}/jvm.cfg
-%attr(755,root,root) %{jredir}/lib/%{arch}/lib[acdfhijmnrvz]*.so
-%exclude %{jredir}/lib/%{arch}/libjsoundalsa.so
 %ifarch %{ix86}
 %attr(755,root,root) %{jredir}/lib/%{arch}/client
 %endif
+%attr(755,root,root) %{jredir}/lib/%{arch}/jli/libjli.so
+%{jredir}/lib/%{arch}/jvm.cfg
+%attr(755,root,root) %{jredir}/lib/%{arch}/lib*.so
 %exclude %{jredir}/lib/%{arch}/libjavaplugin*.so
+%exclude %{jredir}/lib/%{arch}/libJdbcOdbc.so
+%exclude %{jredir}/lib/%{arch}/libjsoundalsa.so
+%exclude %{jredir}/lib/%{arch}/libnpjp2.so
+%exclude %{jredir}/lib/%{arch}/libsplashscreen.so
 
 %{jredir}/lib/deploy
 %{jredir}/lib/desktop
@@ -863,8 +866,6 @@
 %{jredir}/lib/fontconfig.properties.src
 %{jredir}/lib/servicetag
 %attr(755,root,root) %{jredir}/lib/%{arch}/headless/libmawt.so
-%attr(755,root,root) %{jredir}/lib/%{arch}/libsaproc.so
-%attr(755,root,root) %{jredir}/lib/%{arch}/libunpack.so
 %dir %{jredir}/lib/management
 %{jredir}/lib/management/jmxremote.access
 %{jredir}/lib/management/jmxremote.password.template
@@ -1010,6 +1011,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.271  2010/09/02 16:41:45  glen
+- libnpjp2.so was also packaged twice, in plugin and in jre-base package
+  take different approach, list all and exclude, instead of playing with alphabet
+
 Revision 1.270  2010/09/02 16:28:01  glen
 - package libsplashscreen.so only in jre-base-X11 (jre-base pulled xorg deps otherwise)
   rel 2
================================================================

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