SPECS: java-gcj-compat.spec - unified

[qboosh]

Author: qboosh                       Date: Wed Jul 30 17:51:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   java-gcj-compat.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/java-gcj-compat.spec
diff -u SPECS/java-gcj-compat.spec:1.17 SPECS/java-gcj-compat.spec:1.18
--- SPECS/java-gcj-compat.spec:1.17	Mon Jul 28 22:00:41 2008
+++ SPECS/java-gcj-compat.spec	Wed Jul 30 19:51:39 2008
@@ -17,11 +17,11 @@
 %define		_gcc_ver	6:4.3.1-3
 BuildRequires:	gcc-java >= %{_gcc_ver}
 BuildRequires:	rpmbuild(macros) >= 1.453
+Requires:	libgcj >= %{_gcc_ver}
+Provides:	jre
 Obsoletes:	java-sun-jre
 Obsoletes:	java-sun-jre-jdbc
 Obsoletes:	jdkgcj
-Provides:	jre
-Requires:	libgcj >= %{_gcc_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_jvmroot	%{_libdir}/java
@@ -41,11 +41,11 @@
 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
-Provides:	jdk
 Requires:	gcc-java >= %{_gcc_ver}
 Requires:	gjdoc
 Requires:	java-gcj-compat
 Requires:	libgcj-devel >= %{_gcc_ver}
+Provides:	jdk
 Obsoletes:	java-sun
 Obsoletes:	java-sun-tools
 
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2008/07/30 17:51:39  qboosh
+- unified
+
 Revision 1.17  2008/07/28 20:00:41  glen
 - better
 
================================================================

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