Author: pawelz Date: Fri May 7 11:15:19 2010 GMT Module: packages Tag: HEAD ---- Log message: - more obsoletes for clean poldek upgrade - do not obsolete sources. sources package from different JDKs may coexist
---- Files affected: packages/icedtea6: icedtea6.spec (1.60 -> 1.61) ---- Diffs: ================================================================ Index: packages/icedtea6/icedtea6.spec diff -u packages/icedtea6/icedtea6.spec:1.60 packages/icedtea6/icedtea6.spec:1.61 --- packages/icedtea6/icedtea6.spec:1.60 Mon Apr 19 12:18:02 2010 +++ packages/icedtea6/icedtea6.spec Fri May 7 13:15:13 2010 @@ -19,7 +19,7 @@ Summary(pl.UTF-8): Kod OpenJDK i GNU Classpath Name: icedtea6 Version: 1.8 -Release: 4 +Release: 5 License: GPL v2 Group: Development/Languages/Java Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz @@ -82,15 +82,19 @@ Requires: %{name}-jdk = %{version}-%{release} Suggests: %{name}-jre-X11 Suggests: browser-plugin-java-%{name} +Obsoletes: java5-sun +Obsoletes: java5-sun-jre +Obsoletes: java5-sun-jre-jdbc +Obsoletes: java5-sun-jre-X11 +Obsoletes: java5-sun-tools Obsoletes: java-gcj-compat Obsoletes: java-gcj-compat-devel Obsoletes: java-sun Obsoletes: java-sun-demos Obsoletes: java-sun-jre -Obsoletes: java-sun-jre-X11 Obsoletes: java-sun-jre-alsa Obsoletes: java-sun-jre-jdbc -Obsoletes: java-sun-sources +Obsoletes: java-sun-jre-X11 Obsoletes: java-sun-tools BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -140,7 +144,10 @@ Provides: jdk = %{_jdkversion} Obsoletes: blackdown-java-sdk Obsoletes: ibm-java +Obsoletes: java5-sun Obsoletes: java-blackdown +Obsoletes: java-gcj-compat-devel +Obsoletes: java-sun Obsoletes: jdk Obsoletes: kaffe @@ -188,6 +195,7 @@ Provides: java(jsse) = %{version} Provides: java1.4 Provides: jre = %{_jdkversion} +Obsoletes: java5-sun-jre Obsoletes: java(jaas) Obsoletes: java(jaf) Obsoletes: java(jaxp) @@ -198,6 +206,8 @@ Obsoletes: java(jmx) Obsoletes: java(jndi) Obsoletes: java(jsse) +Obsoletes: java-gcj-compat +Obsoletes: java-sun-jre Obsoletes: jre %description jre @@ -854,6 +864,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.61 2010/05/07 11:15:13 pawelz +- more obsoletes for clean poldek upgrade +- do not obsolete sources. sources package from different JDKs may coexist + Revision 1.60 2010/04/19 10:18:02 pawelz - reverted bootstrap_release macro. It does not work on th-src builder. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.60&r2=1.61&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
