Author: glen Date: Sun Dec 9 01:44:11 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adapter
---- Files affected:
SPECS:
java-bea.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SPECS/java-bea.spec
diff -u SPECS/java-bea.spec:1.7 SPECS/java-bea.spec:1.8
--- SPECS/java-bea.spec:1.7 Sun Dec 9 02:43:38 2007
+++ SPECS/java-bea.spec Sun Dec 9 02:44:06 2007
@@ -23,8 +23,8 @@
BuildRequires: rpm-build >= 4.3-0.20040107.21
Requires: %{name}-jre = %{version}-%{release}
Requires: java-shared
-Provides: jdk = %{version}
Provides: j2sdk = %{version}
+Provides: jdk = %{version}
Obsoletes: blackdown-java-sdk
Obsoletes: ibm-java
Obsoletes: java-blackdown
@@ -61,9 +61,9 @@
Summary(pl.UTF-8): Pliki JDBC dla Javy Suna
Group: Development/Languages/Java
Requires: %{name}-jre = %{version}-%{release}
-Provides: %{name}-jdbc
Requires: libodbc.so.1
Requires: libodbcinst.so.1
+Provides: %{name}-jdbc
%description jre-jdbc
This package contains JDBC files for Sun Java.
@@ -77,33 +77,33 @@
Group: Development/Languages/Java
Requires: XFree86-libs
Requires: java-jre-tools
-Provides: java1.4
-Provides: jre = %{version}
+Requires: jpackage-utils
+Provides: jaas = %{version}
Provides: java
+Provides: java1.4
Provides: javaws = %{version}
+Provides: jce = %{version}
+Provides: jdbc-stdext = %{version}
+Provides: jdbc-stdext = 3.0
Provides: jndi = %{version}
-Provides: jndi-ldap = %{version}
Provides: jndi-cos = %{version}
-Provides: jndi-rmi = %{version}
Provides: jndi-dns = %{version}
-Provides: jaas = %{version}
+Provides: jndi-ldap = %{version}
+Provides: jndi-rmi = %{version}
+Provides: jre = %{version}
Provides: jsse = %{version}
-Provides: jce = %{version}
-Provides: jdbc-stdext = 3.0
-Provides: jdbc-stdext = %{version}
-Obsoletes: jre
+Obsoletes: jaas
Obsoletes: java-blackdown-jre
Obsoletes: java-sun-jre
+Obsoletes: jce
+Obsoletes: jdbc-stdext
Obsoletes: jndi
-Obsoletes: jndi-provider-ldap
Obsoletes: jndi-provider-cosnaming
-Obsoletes: jndi-provider-rmiregistry
Obsoletes: jndi-provider-dns
-Obsoletes: jaas
+Obsoletes: jndi-provider-ldap
+Obsoletes: jndi-provider-rmiregistry
+Obsoletes: jre
Obsoletes: jsse
-Obsoletes: jce
-Obsoletes: jdbc-stdext
-Requires: jpackage-utils
%description jre
Java Runtime Environment for Linux.
@@ -131,9 +131,9 @@
Requires: %{name}-jre = %{version}-%{release}
Provides: jar
Provides: java-shared
-Obsoletes: java-shared
-Obsoletes: jar
Obsoletes: fastjar
+Obsoletes: jar
+Obsoletes: java-shared
%description tools
This package contains tools that are common for every Java(TM)
@@ -179,9 +179,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.
@@ -206,17 +206,17 @@
Summary: Mozilla Java plugin
Summary(pl.UTF-8): Wtyczka Javy do Mozilli
Group: Development/Languages/Java
-Requires: mozilla-embedded
Requires: %{name}-mozilla-plugin = %{version}-%{release}
+Requires: mozilla-embedded
Obsoletes: blackdown-java-sdk-mozilla-plugin
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.
@@ -228,11 +228,11 @@
Summary: Mozilla Firefox Java plugin
Summary(pl.UTF-8): Wtyczka Javy do Mozilli Firefox
Group: Development/Languages/Java
-Requires: mozilla-firefox
Requires: %{name}-mozilla-plugin = %{version}-%{release}
-Obsoletes: mozilla-firefox-plugin-java-blackdown
+Requires: mozilla-firefox
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.
@@ -638,6 +638,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2007-12-09 01:44:06 glen
+- adapter
+
Revision 1.7 2007-12-09 01:43:38 glen
- R: jpackage-utils for %{_javadir}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-bea.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
