SPECS: java-gcj-compat.spec - use %cc_version

glen glen at pld-linux.org
Mon Jul 28 21:59:54 CEST 2008


Author: glen                         Date: Mon Jul 28 19:59:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %cc_version

---- Files affected:
SPECS:
   java-gcj-compat.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/java-gcj-compat.spec
diff -u SPECS/java-gcj-compat.spec:1.15 SPECS/java-gcj-compat.spec:1.16
--- SPECS/java-gcj-compat.spec:1.15	Mon Jul 28 15:01:58 2008
+++ SPECS/java-gcj-compat.spec	Mon Jul 28 21:59:48 2008
@@ -16,7 +16,7 @@
 # gcc >= 6:4.3.1-3 is required for working ecj1.
 %define		_gcc_ver	6:4.3.1-3
 BuildRequires:	gcc-java >= %{_gcc_ver}
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.453
 Obsoletes:	java-sun-jre
 Obsoletes:	java-sun-jre-jdbc
 Obsoletes:	jdkgcj
@@ -26,7 +26,7 @@
 
 %define		_jvmroot	%{_libdir}/java
 %define		_jvmdir		%{_jvmroot}/java-1.5.0-gcj-1.5.0.0
-%define		_gccinc		%{_libdir}/gcc/%{_target_platform}/%(%{__cc} -dumpversion)/include
+%define		_gccinc		%{_libdir}/gcc/%{_target_platform}/%{cc_version}/include
 
 %description
 A collection of wrapper scripts, symlinks and jar files. It is meant
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008/07/28 19:59:48  glen
+- use %cc_version
+
 Revision 1.15  2008/07/28 13:01:58  pluto
 - simplify gcc macros.
 - fix javac wrapper (now it runs ecj wich accepts arguments in sunish way).
================================================================

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



More information about the pld-cvs-commit mailing list