Author: jajcus Date: Thu Apr 15 09:52:18 2010 GMT Module: packages Tag: HEAD ---- Log message: - dependencies fixes and improvements, so 'icedtea6' can easily replace installed java-sun or java-gcj-compat - appletviewer subpackage added - Release: 0.2
---- Files affected: packages/icedtea6: icedtea6.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: packages/icedtea6/icedtea6.spec diff -u packages/icedtea6/icedtea6.spec:1.5 packages/icedtea6/icedtea6.spec:1.6 --- packages/icedtea6/icedtea6.spec:1.5 Thu Apr 15 10:59:33 2010 +++ packages/icedtea6/icedtea6.spec Thu Apr 15 11:52:12 2010 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Kod OpenJDK i GNU Classpath Name: icedtea6 Version: 1.8 -Release: 0.1 +Release: 0.2 License: GPL v2 Group: Development/Languages/Java Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz @@ -55,7 +55,19 @@ BuildRequires: zlib-devel BuildRequires: zip Requires: %{name}-jdk = %{version}-%{release} -Requires: %{name}-tools = %{version}-%{release} +Requires: %{name}-jar = %{version}-%{release} +Requires: %{name}-appletviewer = %{version}-%{release} +Obsoletes: java-gcj-compat +Obsoletes: java-gcj-compat-devel +Obsoletes: java-sun +Obsoletes: java-sun-demos +Obsoletes: java-sun-jre-X11 +Obsoletes: java-sun-jre-alsa +Obsoletes: java-sun-jre-jdbc +Obsoletes: java-sun-sources +Obsoletes: java-sun-tools +# redudant with the same in %{name}-jre, but seems needed for clean java-sun replacement +Obsoletes: java-sun-jre BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _gcj_home /usr/lib/java/java-1.5.0-gcj-1.5.0.0 @@ -171,15 +183,28 @@ %package jar Summary: OpenJDK and GNU Classpath code - JAR tool Summary(pl.UTF-8): Kod OpenJDK i GNU Classpath - narzędzie JAR +Requires: %{name}-jdk-base = %{version}-%{release} Provides: jar -Requires: %{name}-jdk-base = %{name}-%{release} +Obsoletes: jar +Obsoletes: fastjar Group: Development/Languages/Java %description jar -JAR tools from OpenJDK compiled using IcedTea6 tool-set. +JAR tool from OpenJDK compiled using IcedTea6 tool-set. JAR is an archiver used to merge Java classes into a single library. +%package appletviewer +Summary: OpenJDK and GNU Classpath code - appletviewer tool +Summary(pl.UTF-8): Kod OpenJDK i GNU Classpath - narzędzie appletviewer +Requires: %{name}-jdk-base = %{version}-%{release} +Requires: %{name}-jre-X11 = %{version}-%{release} +Obsoletes: java-sun-appletviewer +Group: Development/Languages/Java + +%description appletviewer +Appletviewer from OpenJDK compiled using IcedTea6 tool-set. + %package jdk-sources Summary: OpenJDK and GNU Classpath code - sources Summary(pl.UTF-8): Kod OpenJDK i GNU Classpath - kod źródłowy @@ -280,7 +305,6 @@ %files jdk %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/appletviewer %attr(755,root,root) %{_bindir}/apt %attr(755,root,root) %{_bindir}/extcheck %attr(755,root,root) %{_bindir}/idlj @@ -309,7 +333,6 @@ %attr(755,root,root) %{_bindir}/wsgen %attr(755,root,root) %{_bindir}/wsimport %attr(755,root,root) %{_bindir}/xjc -%{_mandir}/man1/appletviewer.* %{_mandir}/man1/apt.* %{_mandir}/man1/extcheck.* %{_mandir}/man1/idlj.* @@ -336,7 +359,6 @@ %{_mandir}/man1/wsgen.* %{_mandir}/man1/wsimport.* %{_mandir}/man1/xjc.* -%lang(ja) %{_mandir}/ja/man1/appletviewer.* %lang(ja) %{_mandir}/ja/man1/apt.* %lang(ja) %{_mandir}/ja/man1/extcheck.* %lang(ja) %{_mandir}/ja/man1/idlj.* @@ -577,6 +599,13 @@ %{_mandir}/man1/jar.* %lang(ja) %{_mandir}/ja/man1/jar.* +%files appletviewer +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/appletviewer +%{_mandir}/man1/appletviewer.* +%lang(ja) %{_mandir}/ja/man1/appletviewer.* + + %files jdk-sources %defattr(644,root,root,755) %dir %{_prefix}/src/%{name}-jdk-sources @@ -593,6 +622,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2010/04/15 09:52:12 jajcus +- dependencies fixes and improvements, so 'icedtea6' can easily replace + installed java-sun or java-gcj-compat +- appletviewer subpackage added +- Release: 0.2 + Revision 1.5 2010/04/15 08:59:33 jajcus - jre-X11 R: jre-freetype ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
