SPECS: java-gcj-compat.spec - C: java-sun-* - sorted deps - rel 5

[pawelz]

Author: pawelz                       Date: Thu Feb 19 10:14:27 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- C: java-sun-*
- sorted deps
- rel 5

---- Files affected:
SPECS:
   java-gcj-compat.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/java-gcj-compat.spec
diff -u SPECS/java-gcj-compat.spec:1.28 SPECS/java-gcj-compat.spec:1.29
--- SPECS/java-gcj-compat.spec:1.28	Tue Feb 17 12:43:45 2009
+++ SPECS/java-gcj-compat.spec	Thu Feb 19 11:14:21 2009
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Skrypty powłoki i dowiązania do symulacji środowiska uruchomieniowego Javy przy użyciu GCJ
 Name:		java-gcj-compat
 Version:	1.0.78
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	ftp://sources.redhat.com/pub/rhug/%{name}-%{version}.tar.gz
@@ -24,6 +24,8 @@
 Obsoletes:	java-sun-jre
 Obsoletes:	java-sun-jre-jdbc
 Obsoletes:	jdkgcj
+Conflicts:	java-sun
+Conflicts:	java-sun-jre-X11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_jvmroot	%{_libdir}/java
@@ -43,15 +45,17 @@
 Summary:	Shell scripts and symbolic links to simulate Java development environment with GCJ
 Summary(pl.UTF-8):	Skrypty powłoki i dowiązania do symulacji środowiska programistycznego Javy przy użyciu GCJ
 Group:		Development/Languages/Java
+Requires:	%{name} = %{version}-%{release}
 Requires:	gcc-java >= %{gcc_ver}
 Requires:	gjdoc
-Requires:	%{name} = %{version}-%{release}
 Requires:	libgcj-devel >= %{gcc_ver}
 Provides:	jar
 Provides:	java-jre-tools
 Provides:	jdk = 1.5
 Obsoletes:	java-sun
 Obsoletes:	java-sun-tools
+Conflicts:	java-sun-jre
+Conflicts:	java-sun-jre-X11
 
 %description devel
 A collection of wrapper scripts, symlinks and jar files. It is meant
@@ -176,6 +180,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2009/02/19 10:14:21  pawelz
+- C: java-sun-*
+- sorted deps
+- rel 5
+
 Revision 1.28  2009/02/17 11:43:45  pawelz
 - P: jce = 1.5
 - rel 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-gcj-compat.spec?r1=1.28&r2=1.29&f=u