Author: jajcus Date: Fri Apr 16 11:47:27 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- '-base subpackages' changes merged from java-sun.spec
---- Files affected:
packages/java5-sun:
java5-sun.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/java5-sun/java5-sun.spec
diff -u packages/java5-sun/java5-sun.spec:1.1
packages/java5-sun/java5-sun.spec:1.2
--- packages/java5-sun/java5-sun.spec:1.1 Fri Apr 16 13:14:58 2010
+++ packages/java5-sun/java5-sun.spec Fri Apr 16 13:47:21 2010
@@ -1,7 +1,5 @@
# $Revision$, $Date$
# TODO:
-# - better way to choose preferred jvm (currently the symlinks are hardcoded)
-# Maybe a package containing only the symlinks?
# - package? /usr/lib/jvm/java-sun-1.5.0.12/jre/lib/deploy/ffjcext.zip
#
%define _ver 1.5.0.19
@@ -11,7 +9,7 @@
%define _classdataversion 49.0
%include /usr/lib/rpm/macros.java
Summary: Sun JDK (Java Development Kit) for Linux
-Summary(pl): Sun JDK - �rodowisko programistyczne Javy dla Linuksa
+Summary(pl.UTF-8): Sun JDK - środowisko programistyczne Javy dla Linuksa
Name: java5-sun
Version: %{_ver}
Release: 1
@@ -31,8 +29,7 @@
BuildRequires: rpmbuild(macros) >= 1.357
BuildRequires: unzip
Requires: %{name}-jre = %{version}-%{release}
-Requires: java-shared
-Requires: jpackage-utils >= 0:1.6.6-5
+Requires: %{name}-jdk-base = %{version}-%{release}
Provides: j2sdk = %{version}
Provides: jdk = %{version}
Obsoletes: blackdown-java-sdk
@@ -61,26 +58,39 @@
%description
Java Development Kit for Linux.
-%description -l pl
-�rodowisko programistyczne Javy dla Linuksa.
+%description -l pl.UTF-8
+Środowisko programistyczne Javy dla Linuksa.
%package appletviewer
Summary: Java applet viewer from Sun Java
-Summary(pl): Przegl�darka applet�w Javy Suna
+Summary(pl.UTF-8): Przeglądarka appletów Javy Suna
Group: Development/Languages/Java
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-jdk-base = %{version}-%{release}
%description appletviewer
This package applet viewer for Sun Java.
-%description appletviewer -l pl
-Ten pakiet zawiera przegl�dark� applet�w dla Javy Suna.
+%description appletviewer -l pl.UTF-8
+Ten pakiet zawiera przeglądarkę appletów dla Javy Suna.
+
+%package jdk-base
+Summary: Sun JDK (Java Development Kit) for Linux
+Summary(pl.UTF-8): Sun JDK - środowisko programistyczne Javy dla Linuksa
+Group: Development/Languages/Java
+Requires: %{name}-tools = %{version}-%{release}
+Requires: jpackage-utils >= 0:1.6.6-14
+
+%description jdk-base
+Java Development Kit for Linux.
+
+%description jdk-base -l pl.UTF-8
+Środowisko programistyczne Javy dla Linuksa.
%package jre-jdbc
Summary: JDBC files for Sun Java
-Summary(pl): Pliki JDBC dla Javy Suna
+Summary(pl.UTF-8): Pliki JDBC dla Javy Suna
Group: Development/Languages/Java
-Requires: %{name}-jre = %{version}-%{release}
+Requires: %{name}-jre-base = %{version}-%{release}
%ifarch %{x8664}
Requires: libodbc.so.1()(64bit)
Requires: libodbcinst.so.1()(64bit)
@@ -94,14 +104,15 @@
%description jre-jdbc
This package contains JDBC files for Sun Java.
-%description jre-jdbc -l pl
+%description jre-jdbc -l pl.UTF-8
Ten pakiet zawiera pliki JDBC dla Javy Suna.
%package jre
Summary: Sun JRE (Java Runtime Environment) for Linux
-Summary(pl): Sun JRE - �rodowisko uruchomieniowe Javy dla Linuksa
+Summary(pl.UTF-8): Sun JRE - środowisko uruchomieniowe Javy dla Linuksa
Group: Development/Languages/Java
-Requires: java-jre-tools
+Requires: %{name}-tools = %{version}-%{release}
+Requires: %{name}-jre-base = %{version}-%{release}
Requires: jpackage-utils
Provides: j2re = %{version}
Provides: jaas = %{version}
@@ -135,20 +146,36 @@
Obsoletes: jndi-provider-rmiregistry
Obsoletes: jre
Obsoletes: jsse
+Suggests: %{name}-X11
%description jre
Java Runtime Environment for Linux. Does not contain any X11-related
compontents.
-%description jre -l pl
-�rodowisko uruchomieniowe Javy dla Linuksa. Nie zawiera �adnych
-element�w zwi�zanych ze �rodowiskiem X11.
+%description jre -l pl.UTF-8
+Środowisko uruchomieniowe Javy dla Linuksa. Nie zawiera żadnych
+elementów związanych ze środowiskiem X11.
+
+%package jre-base
+Summary: Sun JRE (Java Runtime Environment) for Linux
+Summary(pl.UTF-8): Sun JRE - środowisko uruchomieniowe Javy dla Linuksa
+Group: Development/Languages/Java
+Requires: jpackage-utils >= 0:1.6.6-14
+
+%description jre-base
+Java Runtime Environment for Linux. Does not contain any X11-related
+compontents.
+
+%description jre-base -l pl.UTF-8
+Środowisko uruchomieniowe Javy dla Linuksa. Nie zawiera żadnych
+elementów związanych ze środowiskiem X11.
%package jre-X11
Summary: Sun JRE (Java Runtime Environment) for Linux, X11 related parts
-Summary(pl): Sun JRE - �rodowisko uruchomieniowe Javy dla Linuksa, cz��ci
korzystaj�ce z X11
+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}
+Requires: %{name}-jre-base = %{version}-%{release}
+Requires: %{name}-jre-base-X11 = %{version}-%{release}
Provides: jre-X11 = %{version}
%ifarch %{ix86}
Provides: javaws = %{version}
@@ -157,62 +184,71 @@
%description jre-X11
X11-related part of Java Runtime Environment for Linux.
-%description jre-X11 -l pl
-�rodowisko uruchomieniowe Javy dla Linuksa, cz��� zwi�zana ze
-�rodowiskiem graficznym X11.
+%description jre-X11 -l pl.UTF-8
+Środowisko uruchomieniowe Javy dla Linuksa, część związana ze
+środowiskiem graficznym X11.
+
+%package jre-base-X11
+Summary: Sun JRE (Java Runtime Environment) for Linux, X11 related parts
+Summary(pl.UTF-8): Sun JRE - środowisko uruchomieniowe Javy dla Linuksa,
części korzystające z X11
+Group: Development/Languages/Java
+Requires: %{name}-jre-base = %{version}-%{release}
+
+%description jre-base-X11
+X11-related part of Java Runtime Environment for Linux.
+
+%description jre-base-X11 -l pl.UTF-8
+Środowisko uruchomieniowe Javy dla Linuksa, część związana ze
+środowiskiem graficznym X11.
%package jre-alsa
Summary: JRE module for ALSA sound support
-Summary(pl): Modu� JRE do obs�ugi d�wi�ku poprzez ALSA
+Summary(pl.UTF-8): Moduł JRE do obsługi dźwięku poprzez ALSA
Group: Development/Languages/Java
-Requires: %{name}-jre = %{version}-%{release}
+Requires: %{name}-jre-base = %{version}-%{release}
Provides: %{name}-alsa
Obsoletes: java-sun-alsa
%description jre-alsa
JRE module for ALSA sound support.
-%description jre-alsa -l pl
-Modu� JRE do obs�ugi d�wi�ku poprzez ALSA.
+%description jre-alsa -l pl.UTF-8
+Moduł JRE do obsługi dźwięku poprzez ALSA.
%package tools
Summary: Shared Java tools
-Summary(pl): Wsp��dzielone narz�dzia Javy
+Summary(pl.UTF-8): Współdzielone narzędzia Javy
Group: Development/Languages/Java
-Requires: %{name}-jre = %{version}-%{release}
+Requires: %{name}-jre-base = %{version}-%{release}
Provides: jar
Provides: java-jre-tools
-Provides: java-shared
Obsoletes: fastjar
Obsoletes: jar
Obsoletes: java-jre-tools
-Obsoletes: java-shared
%description tools
This package contains tools that are common for every Java(TM)
implementation, such as rmic or jar.
-%description tools -l pl
-Pakiet ten zawiera narz�dzia wsp�lne dla ka�dej implementacji
+%description tools -l pl.UTF-8
+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
+Summary(pl.UTF-8): Programy demonstracyjne do JDK
Group: Development/Languages/Java
-Requires: %{name}-jre = %{version}-%{release}
-Obsoletes: java-blackdown-demos
-Obsoletes: jdk-demos
+Requires: jre
%description demos
JDK demonstration programs.
-%description demos -l pl
+%description demos -l pl.UTF-8
Programy demonstracyjne do JDK.
%package -n browser-plugin-%{name}
Summary: Java plugin for WWW browsers
-Summary(pl): Wtyczki Javy do przegl�darek WWW
+Summary(pl.UTF-8): Wtyczki Javy do przeglądarek WWW
Group: Development/Languages/Java
Requires: %{name}-jre-X11 = %{version}-%{release}
Requires: browser-plugins >= 2.0
@@ -239,20 +275,20 @@
%description -n browser-plugin-%{name}
Java plugin for WWW browsers.
-%description -n browser-plugin-%{name} -l pl
-Wtyczki z obs�ug� Javy dla przegl�darek WWW.
+%description -n browser-plugin-%{name} -l pl.UTF-8
+Wtyczki z obsługą Javy dla przeglądarek WWW.
%package sources
-Summary: JDK sources
-Summary(pl): �r�d�a JDK
+Summary: JRE standard library sources
+Summary(pl.UTF-8): Źródła standardowej biblioteki JRE
Group: Development/Languages/Java
Requires: %{name}-jre = %{version}-%{release}
%description sources
-Sources for package JDK.
+Sources for the standard Java library.
-%description sources -l pl
-�r�d�a dla pakietu JDK.
+%description sources -l pl.UTF-8
+Źródła standardowej bilioteki Java.
%prep
%setup -q -T -c -n jdk%{_dir_ver}
@@ -432,6 +468,47 @@
%attr(755,root,root) %{_bindir}/jstatd
%attr(755,root,root) %{_bindir}/native2ascii
%attr(755,root,root) %{_bindir}/serialver
+%{_mandir}/man1/apt.1*
+%{_mandir}/man1/extcheck.1*
+%{_mandir}/man1/idlj.1*
+%{_mandir}/man1/jarsigner.1*
+%{_mandir}/man1/javac.1*
+%{_mandir}/man1/javadoc.1*
+%{_mandir}/man1/javah.1*
+%{_mandir}/man1/javap.1*
+%{_mandir}/man1/jdb.1*
+%{_mandir}/man1/jinfo.1*
+%{_mandir}/man1/jmap.1*
+%{_mandir}/man1/jps.1*
+%{_mandir}/man1/jsadebugd.1*
+%{_mandir}/man1/jstack.1*
+%{_mandir}/man1/jstat.1*
+%{_mandir}/man1/jstatd.1*
+%{_mandir}/man1/native2ascii.1*
+%{_mandir}/man1/serialver.1*
+%{_mandir}/man1/jconsole.1*
+%lang(ja) %{_mandir}/ja/man1/apt.1*
+%lang(ja) %{_mandir}/ja/man1/extcheck.1*
+%lang(ja) %{_mandir}/ja/man1/idlj.1*
+%lang(ja) %{_mandir}/ja/man1/jarsigner.1*
+%lang(ja) %{_mandir}/ja/man1/javac.1*
+%lang(ja) %{_mandir}/ja/man1/javadoc.1*
+%lang(ja) %{_mandir}/ja/man1/javah.1*
+%lang(ja) %{_mandir}/ja/man1/javap.1*
+%lang(ja) %{_mandir}/ja/man1/jdb.1*
+%lang(ja) %{_mandir}/ja/man1/jinfo.1*
+%lang(ja) %{_mandir}/ja/man1/jmap.1*
+%lang(ja) %{_mandir}/ja/man1/jps.1*
+%lang(ja) %{_mandir}/ja/man1/jsadebugd.1*
+%lang(ja) %{_mandir}/ja/man1/jstack.1*
+%lang(ja) %{_mandir}/ja/man1/jstat.1*
+%lang(ja) %{_mandir}/ja/man1/jstatd.1*
+%lang(ja) %{_mandir}/ja/man1/native2ascii.1*
+%lang(ja) %{_mandir}/ja/man1/serialver.1*
+%lang(ja) %{_mandir}/ja/man1/jconsole.1*
+
+%files jdk-base
+%defattr(644,root,root,755)
%ifarch %{ix86}
%attr(755,root,root) %{javadir}/bin/HtmlConverter
%attr(755,root,root) %{javadir}/bin/ControlPanel
@@ -471,44 +548,6 @@
%dir %{javadir}/lib
%{javadir}/lib/*.jar
%{javadir}/lib/*.idl
-%{_mandir}/man1/apt.1*
-%{_mandir}/man1/extcheck.1*
-%{_mandir}/man1/idlj.1*
-%{_mandir}/man1/jarsigner.1*
-%{_mandir}/man1/javac.1*
-%{_mandir}/man1/javadoc.1*
-%{_mandir}/man1/javah.1*
-%{_mandir}/man1/javap.1*
-%{_mandir}/man1/jdb.1*
-%{_mandir}/man1/jinfo.1*
-%{_mandir}/man1/jmap.1*
-%{_mandir}/man1/jps.1*
-%{_mandir}/man1/jsadebugd.1*
-%{_mandir}/man1/jstack.1*
-%{_mandir}/man1/jstat.1*
-%{_mandir}/man1/jstatd.1*
-%{_mandir}/man1/native2ascii.1*
-%{_mandir}/man1/serialver.1*
-%{_mandir}/man1/jconsole.1*
-%lang(ja) %{_mandir}/ja/man1/apt.1*
-%lang(ja) %{_mandir}/ja/man1/extcheck.1*
-%lang(ja) %{_mandir}/ja/man1/idlj.1*
-%lang(ja) %{_mandir}/ja/man1/jarsigner.1*
-%lang(ja) %{_mandir}/ja/man1/javac.1*
-%lang(ja) %{_mandir}/ja/man1/javadoc.1*
-%lang(ja) %{_mandir}/ja/man1/javah.1*
-%lang(ja) %{_mandir}/ja/man1/javap.1*
-%lang(ja) %{_mandir}/ja/man1/jdb.1*
-%lang(ja) %{_mandir}/ja/man1/jinfo.1*
-%lang(ja) %{_mandir}/ja/man1/jmap.1*
-%lang(ja) %{_mandir}/ja/man1/jps.1*
-%lang(ja) %{_mandir}/ja/man1/jsadebugd.1*
-%lang(ja) %{_mandir}/ja/man1/jstack.1*
-%lang(ja) %{_mandir}/ja/man1/jstat.1*
-%lang(ja) %{_mandir}/ja/man1/jstatd.1*
-%lang(ja) %{_mandir}/ja/man1/native2ascii.1*
-%lang(ja) %{_mandir}/ja/man1/serialver.1*
-%lang(ja) %{_mandir}/ja/man1/jconsole.1*
%files appletviewer
%defattr(644,root,root,755)
@@ -526,10 +565,8 @@
%attr(755,root,root) %{jredir}/lib/amd64/libJdbcOdbc.so
%endif
-%files jre
+%files jre-base
%defattr(644,root,root,755)
-%doc jre/{CHANGES,COPYRIGHT,LICENSE,README,*.txt}
-%doc jre/Welcome.html
%{_jvmdir}/jre
%{_jvmjardir}/jre
%attr(755,root,root) %{_bindir}/java
@@ -650,6 +687,12 @@
%{jredir}/lib/management/jmxremote.password.template
%{jredir}/lib/management/management.properties
%{jredir}/lib/management/snmp.acl.template
+
+%files jre
+%defattr(644,root,root,755)
+%doc jre/{CHANGES,COPYRIGHT,LICENSE,README,*.txt}
+%doc jre/Welcome.html
+%doc jre/Xusage*
%{_mandir}/man1/java.1*
%ifarch %{ix86}
%{_desktopdir}/sun_java.desktop
@@ -676,14 +719,9 @@
%lang(ja) %{_mandir}/ja/man1/servertool.1*
%lang(ja) %{_mandir}/ja/man1/tnameserv.1*
-%files jre-X11
+%files jre-base-X11
%defattr(644,root,root,755)
%ifarch %{ix86}
-%doc jre/Xusage*
-%attr(755,root,root) %{_bindir}/ControlPanel
-%endif
-%attr(755,root,root) %{_bindir}/policytool
-%ifarch %{ix86}
%attr(755,root,root) %{jredir}/bin/javaws
%attr(755,root,root) %{jredir}/bin/ControlPanel
%endif
@@ -708,7 +746,6 @@
%ifarch %{ix86}
%{jvmjardir}/javaws.jar
%endif
-%ifarch %{ix86}
%attr(755,root,root) %{jredir}/lib/i386/motif21/libmawt.so
%attr(755,root,root) %{jredir}/lib/i386/xawt/libmawt.so
%dir %{jredir}/lib/javaws
@@ -725,6 +762,23 @@
%{jredir}/lib/javaws/messages_zh_HK.properties
%{jredir}/lib/javaws/messages_zh_TW.properties
%{jredir}/lib/javaws/miniSplash.jpg
+%ifarch %{x8664}
+%attr(755,root,root) %{jredir}/lib/amd64/motif21/libmawt.so
+%attr(755,root,root) %{jredir}/lib/amd64/xawt/libmawt.so
+%endif
+%ifarch %{ix86}
+%dir %{jredir}/javaws
+%attr(755,root,root) %{jredir}/javaws/javaws
+%endif
+
+%files jre-X11
+%defattr(644,root,root,755)
+%ifarch %{ix86}
+%attr(755,root,root) %{_bindir}/ControlPanel
+%endif
+%attr(755,root,root) %{_bindir}/policytool
+%{_mandir}/man1/policytool.1*
+%ifarch %{ix86}
%dir %{jredir}/lib/locale
%lang(de) %{jredir}/lib/locale/de
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -747,19 +801,10 @@
%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/sunw_java_plugin.mo
%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
%endif
-%ifarch %{x8664}
-%attr(755,root,root) %{jredir}/lib/amd64/motif21/libmawt.so
-%attr(755,root,root) %{jredir}/lib/amd64/xawt/libmawt.so
-%endif
-%{_mandir}/man1/policytool.1*
%ifarch %{ix86}
%lang(ja) %{_mandir}/ja/man1/javaws.1*
%endif
%lang(ja) %{_mandir}/ja/man1/policytool.1*
-%ifarch %{ix86}
-%dir %{jredir}/javaws
-%attr(755,root,root) %{jredir}/javaws/javaws
-%endif
%files jre-alsa
%defattr(644,root,root,755)
@@ -828,6 +873,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2010/04/16 11:47:21 jajcus
+- '-base subpackages' changes merged from java-sun.spec
+
Revision 1.1 2010/04/16 11:14:58 jajcus
- new package, copied from java-sun at java-sun-1_5 branch
@@ -1014,7 +1062,7 @@
- updated to 1.5.0.05
Revision 1.106 2005/09/20 19:30:09 sardzent
-- fixed URL to sources send by Micha� Sutkowski <michal(at)sutkowski(dot)pl>
+- fixed URL to sources send by Michał Sutkowski <michal(at)sutkowski(dot)pl>
Revision 1.105 2005/09/02 18:55:51 qboosh
- pl desc for -sources
@@ -1244,7 +1292,7 @@
- upddated to 1.4.2; lot of changes
Revision 1.35 2003/06/23 11:53:02 djrzulf
-- updated to 03 by �ukasz Ma�ko <[email protected]>,
+- updated to 03 by Łukasz Maśko <[email protected]>,
Revision 1.34 2003/05/25 05:49:07 misi3k
- massive attack s/pld.org.pl/pld-linux.org/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java5-sun/java5-sun.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
