Author: havner Date: Tue Mar 8 09:07:21 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- again merged jre-tools with tools, splitting them makes artificial
conflicts with other packages providing java-shared, jar overload
is tottaly accepted
---- Files affected:
SPECS:
java-sun.spec (1.89 -> 1.90)
---- Diffs:
================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.89 SPECS/java-sun.spec:1.90
--- SPECS/java-sun.spec:1.89 Thu Feb 24 19:10:28 2005
+++ SPECS/java-sun.spec Tue Mar 8 10:07:15 2005
@@ -6,7 +6,7 @@
Summary(pl): Sun JDK - środowisko programistyczne Javy dla Linuksa
Name: java-sun
Version: %{_ver}
-Release: 1
+Release: 2
License: restricted, non-distributable
Group: Development/Languages/Java
# download directly from http://java.sun.com/j2se/1.5.0/download.jsp
@@ -137,6 +137,7 @@
Requires: %{name}-jre = %{version}-%{release}
Provides: jar
Provides: java-shared
+Provides: java-jre-tools
Obsoletes: java-shared
Obsoletes: jar
Obsoletes: fastjar
@@ -149,21 +150,6 @@
Pakiet ten zawiera narzędzia wspólne dla każdej implementacji
Javy(TM), takie jak rmic czy jar.
-%package jre-tools
-Summary: Shared Java tools
-Summary(pl): Współdzielone narzędzia Javy
-Group: Development/Languages/Java
-Requires: %{name}-jre = %{version}-%{release}
-Provides: java-jre-tools
-
-%description jre-tools
-This package contains tools that are common for every Java(TM)
-implementation, such as rmic or jar.
-
-%description jre-tools -l pl
-Pakiet ten zawiera narzędzia wspólne dla każdej implementacji
-Javy(TM), takie jak rmic czy jar.
-
%package demos
Summary: JDK demonstration programs
Summary(pl): Programy demonstracyjne do JDK
@@ -708,17 +694,14 @@
%attr(755,root,root) %{_bindir}/jar
%attr(755,root,root) %{_bindir}/rmic
%attr(755,root,root) %{_bindir}/rmiregistry
+%attr(755,root,root) %{jredir}/bin/rmiregistry
%attr(755,root,root) %{javadir}/bin/jar
%attr(755,root,root) %{javadir}/bin/rmic
%{_mandir}/man1/jar.1*
%{_mandir}/man1/rmic.1*
+%{_mandir}/man1/rmiregistry.1*
%lang(ja) %{_mandir}/ja/man1/jar.1*
%lang(ja) %{_mandir}/ja/man1/rmic.1*
-
-%files jre-tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{jredir}/bin/rmiregistry
-%{_mandir}/man1/rmiregistry.1*
%lang(ja) %{_mandir}/ja/man1/rmiregistry.1*
%ifarch %{ix86}
@@ -742,6 +725,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.90 2005/03/08 09:07:15 havner
+- again merged jre-tools with tools, splitting them makes artificial
+ conflicts with other packages providing java-shared, jar overload
+ is tottaly accepted
+
Revision 1.89 2005/02/24 18:10:28 qboosh
- j2se 1.5 contains jaxp 1.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.89&r2=1.90&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
