SPECS: java-sun.spec - no macros in obsoletes - use java-sun-ng rather

[glen]

Author: glen                         Date: Thu Feb  5 15:59:34 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no macros in obsoletes
- use java-sun-ng rather

---- Files affected:
SPECS:
   java-sun.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.217 SPECS/java-sun.spec:1.218
--- SPECS/java-sun.spec:1.217	Thu Feb  5 14:33:16 2009
+++ SPECS/java-sun.spec	Thu Feb  5 16:59:28 2009
@@ -165,8 +165,8 @@
 Summary(pl.UTF-8):	Sun JRE - środowisko uruchomieniowe Javy dla Linuksa, części korzystające z X11
 Group:		Development/Languages/Java
 Requires:	%{name}-jre = %{version}-%{release}
-Provides:	jre-X11 = %{version}
 Provides:	javaws = %{version}
+Provides:	jre-X11 = %{version}
 
 %description jre-X11
 X11-related part of Java Runtime Environment for Linux.
@@ -236,7 +236,7 @@
 Provides:	mozilla-firefox-plugin-java-sun
 Provides:	mozilla-plugin-java-sun
 Obsoletes:	blackdown-java-sdk-mozilla-plugin
-Obsoletes:	browser-plugin-ng-%{name}
+Obsoletes:	browser-plugin-java-sun-ng
 Obsoletes:	java-blackdown-mozilla-plugin
 Obsoletes:	java-sun-moz-plugin
 Obsoletes:	java-sun-mozilla-plugin
@@ -258,7 +258,7 @@
 %description -n browser-plugin-%{name} -l pl.UTF-8
 Wtyczka z obsługą Javy dla przeglądarek WWW.
 
-%package -n browser-plugin-ng-%{name}
+%package -n browser-plugin-%{name}-ng
 Summary:	Next-Generation Java plugin for WWW browsers
 Summary(pl.UTF-8):	Wtyczka Javy Nowej Generacji do przeglądarek WWW
 Group:		Development/Languages/Java
@@ -269,7 +269,7 @@
 Provides:	mozilla-firefox-plugin-java-sun
 Provides:	mozilla-plugin-java-sun
 Obsoletes:	blackdown-java-sdk-mozilla-plugin
-Obsoletes:	browser-plugin-%{name}
+Obsoletes:	browser-plugin-java-sun
 Obsoletes:	java-blackdown-mozilla-plugin
 Obsoletes:	java-sun-moz-plugin
 Obsoletes:	java-sun-mozilla-plugin
@@ -285,11 +285,11 @@
 Obsoletes:	mozilla-plugin-java-blackdown
 Obsoletes:	mozilla-plugin-java-sun
 
-%description -n browser-plugin-ng-%{name}
+%description -n browser-plugin-%{name}-ng
 Next-Generation Java plugin for WWW browsers. Works only with
 Firefox/Iceweasel 3.x.
 
-%description -n browser-plugin-ng-%{name} -l pl.UTF-8
+%description -n browser-plugin-%{name}-ng -l pl.UTF-8
 Wtyczka Nowej Generacji z obsługą Javy dla przeglądarek WWW. Działa
 tylko z Firefoxem/Iceweaselem 3.x.
 
@@ -509,10 +509,10 @@
 	%update_browser_plugins
 fi
 
-%post -n browser-plugin-ng-%{name}
+%post -n browser-plugin-%{name}-ng
 %update_browser_plugins
 
-%postun -n browser-plugin-ng-%{name}
+%postun -n browser-plugin-%{name}-ng
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
@@ -880,15 +880,17 @@
 %dir %{jredir}/plugin/%{arch}
 %dir %{jredir}/plugin/%{arch}/ns7
 %dir %{jredir}/plugin/%{arch}/ns7-gcc29
+# XXX: duplicate
 %attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so
 %attr(755,root,root) %{jredir}/plugin/%{arch}/*/libjavaplugin_oji.so
 %attr(755,root,root) %{_browserpluginsdir}/libjavaplugin_oji.so
 %{jredir}/plugin/desktop
 %endif
 
-%files -n browser-plugin-ng-%{name}
+%files -n browser-plugin-%{name}-ng
 %defattr(644,root,root,755)
 %dir %{jredir}/plugin
+# XXX: duplicate
 %attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so
 %attr(755,root,root) %{jredir}/lib/%{arch}/libnpjp2.so
 %attr(755,root,root) %{_browserpluginsdir}/libnpjp2.so
@@ -905,6 +907,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2009/02/05 15:59:28  glen
+- no macros in obsoletes
+- use java-sun-ng rather
+
 Revision 1.217  2009/02/05 13:33:16  hawk
 - package old Java plugin as default one, new plugin as browser-plugin-ng
   (it works only with Firefox/Iceweasel 3.x), mutual O: for plugins
================================================================

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