Author: qboosh Date: Tue Mar 8 20:49:55 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- sorted Obsoletes
---- Files affected:
SPECS:
java-sun.spec (1.92 -> 1.93)
---- Diffs:
================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.92 SPECS/java-sun.spec:1.93
--- SPECS/java-sun.spec:1.92 Tue Mar 8 10:30:31 2005
+++ SPECS/java-sun.spec Tue Mar 8 21:49:50 2005
@@ -96,18 +96,18 @@
Provides: jsse = %{version}
Provides: jdbc-stdext = 3.0
Provides: jdbc-stdext = %{version}
+Obsoletes: jaas
Obsoletes: java-blackdown-jre
Obsoletes: jaxp
Obsoletes: jce
+Obsoletes: jdbc-stdext
Obsoletes: jndi
Obsoletes: jndi-provider-cosnaming
Obsoletes: jndi-provider-dns
Obsoletes: jndi-provider-ldap
Obsoletes: jndi-provider-rmiregistry
-Obsoletes: jaas
Obsoletes: jre
Obsoletes: jsse
-Obsoletes: jdbc-stdext
%description jre
Java Runtime Environment for Linux.
@@ -137,10 +137,10 @@
Provides: jar
Provides: java-shared
Provides: java-jre-tools
-Obsoletes: java-shared
-Obsoletes: java-jre-tools
-Obsoletes: jar
Obsoletes: fastjar
+Obsoletes: jar
+Obsoletes: java-jre-tools
+Obsoletes: java-shared
%description tools
This package contains tools that are common for every Java(TM)
@@ -171,9 +171,9 @@
Requires: %{name}-jre = %{version}-%{release}
Requires: netscape-common >= 4.0
Obsoletes: blackdown-java-sdk-netscape4-plugin
-Obsoletes: netscape4-plugin-java-blackdown
Obsoletes: java-sun-nn4-plugin
Obsoletes: jre-netscape4-plugin
+Obsoletes: netscape4-plugin-java-blackdown
%description -n netscape4-plugin-%{name}
Java plugin for Netscape 4.x.
@@ -204,11 +204,11 @@
Obsoletes: java-sun-moz-plugin
Obsoletes: jre-mozilla-plugin
Obsoletes: mozilla-plugin-blackdown-java-sdk
-Obsoletes: mozilla-plugin-java-blackdown
-Obsoletes: mozilla-plugin-java-sun
Obsoletes: mozilla-plugin-gcc2-java-sun
Obsoletes: mozilla-plugin-gcc3-java-sun
Obsoletes: mozilla-plugin-gcc32-java-sun
+Obsoletes: mozilla-plugin-java-blackdown
+Obsoletes: mozilla-plugin-java-sun
%description -n mozilla-plugin-%{name}
Java plugin for Mozilla compiled using gcc 3.
@@ -222,9 +222,9 @@
Group: Development/Languages/Java
PreReq: mozilla-firefox
Requires: %{name}-mozilla-plugin = %{version}-%{release}
-Obsoletes: mozilla-firefox-plugin-java-blackdown
Obsoletes: mozilla-firefox-plugin-gcc2-java-sun
Obsoletes: mozilla-firefox-plugin-gcc3-java-sun
+Obsoletes: mozilla-firefox-plugin-java-blackdown
%description -n mozilla-firefox-plugin-%{name}
Java plugin for Mozilla Firefox compiled using gcc 3.
@@ -725,6 +725,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.93 2005/03/08 20:49:50 qboosh
+- sorted Obsoletes
+
Revision 1.92 2005/03/08 09:30:31 havner
- obsolete by virtual name, for possibly other packages
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.92&r2=1.93&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
