Author: peroyvind
Date: Wed Feb 14 16:52:59 2007
New Revision: 120999
Modified:
packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
Log:
d'oh, remove kaffe conflict again, no magic, only david ;p
Modified: packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
==============================================================================
--- packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec
(original)
+++ packages/cooker/java-1.5.0-sun/current/SPECS/java-1.5.0-sun.spec Wed Feb
14 16:52:59 2007
@@ -56,7 +56,6 @@
Provides: java = %{javaver}
Requires: update-alternatives
Requires: jpackage-utils >= 0:1.5.38
-Conflicts: kaffe
BuildArch: i586 x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: jpackage-utils >= 0:1.5.38 sed lzma
