Author: walluck
Date: Tue Oct 31 05:42:00 2006
New Revision: 73919
Added:
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-gcj-compat-1.0.68.tar.bz2
(contents, props changed)
Removed:
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-gcj-compat-1.0.65.tar.bz2
Modified:
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-1.4.2-gcj-compat-aot-compile-rpm.patch
packages/cooker/java-1.4.2-gcj-compat/current/SPECS/java-1.4.2-gcj-compat.spec
Log:
40.110 (1.0.68)
Modified:
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-1.4.2-gcj-compat-aot-compile-rpm.patch
==============================================================================
---
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-1.4.2-gcj-compat-aot-compile-rpm.patch
(original)
+++
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-1.4.2-gcj-compat-aot-compile-rpm.patch
Tue Oct 31 05:42:00 2006
@@ -1,5 +1,5 @@
---- java-gcj-compat-1.0.62/aot-compile-rpm.aot-compile-rpm 2006-08-23
08:04:04.000000000 -0400
-+++ java-gcj-compat-1.0.62/aot-compile-rpm 2006-08-25 20:10:49.000000000
-0400
+--- java-gcj-compat-1.0.68/aot-compile-rpm.aot-compile-rpm 2006-09-07
23:59:16.000000000 +0200
++++ java-gcj-compat-1.0.68/aot-compile-rpm 2006-10-31 05:09:21.000000000
+0100
@@ -15,6 +15,7 @@
import aotcompile
@@ -9,9 +9,9 @@
def libdir():
@@ -41,7 +42,8 @@
- dstdir = os.path.join(srcdir, libdir().strip(os.sep), name)
+ dstdir = os.path.join(libdir(), "gcj", name)
- compiler = aotcompile.Compiler(srcdir, dstdir)
+ compiler = aotcompile.Compiler(srcdir, dstdir, srcdir)
- compiler.gcjflags[0:0] = os.environ.get("RPM_OPT_FLAGS", "").split()
+ p = re.compile('-O[2-9]+');
+ compiler.gcjflags[0:0] = p.sub('-O', os.environ.get("RPM_OPT_FLAGS",
"")).split()
Added:
packages/cooker/java-1.4.2-gcj-compat/current/SOURCES/java-gcj-compat-1.0.68.tar.bz2
==============================================================================
Binary file. No diff available.
Modified:
packages/cooker/java-1.4.2-gcj-compat/current/SPECS/java-1.4.2-gcj-compat.spec
==============================================================================
---
packages/cooker/java-1.4.2-gcj-compat/current/SPECS/java-1.4.2-gcj-compat.spec
(original)
+++
packages/cooker/java-1.4.2-gcj-compat/current/SPECS/java-1.4.2-gcj-compat.spec
Tue Oct 31 05:42:00 2006
@@ -13,7 +13,7 @@
%define buildver 0
# the version-release string for the gcj rpms we require
%define gccver 4.1.1
-%define jgcver 1.0.65
+%define jgcver 1.0.68
%define jar %{_bindir}/fastjar
%define cname java-%{javaver}-%{origin}
@@ -30,7 +30,7 @@
Name: java-%{javaver}-%{origin}-compat
Version: %{javaver}.%{buildver}
-Release: %mkrel 40.103.1
+Release: %mkrel 40.110.1
Epoch: 0
Summary: JPackage runtime scripts for GCJ
@@ -202,6 +202,13 @@
sed "s,compiler.batch.Main,compiler.batch.Main -bootclasspath $LIBGCJ_JAR,g" <
ecj-2 > ecj-%{cname}
%endif
+# the python compiler encodes the source file's timestamp in the .pyc
+# and .pyo headers. since aotcompile.py is generated by configure,
+# its timestamp will differ from build to build. this causes multilib
+# conflicts. we work around this by setting aotcompile.py's timestamp
+# to equal aotcompile.py.in's timestamp. (205216)
+touch --reference=aotcompile.py.in aotcompile.py
+
%install
%if %{custom}
export PATH=%{gcj_prefix}/bin:$PATH
@@ -304,6 +311,9 @@
xargs gjdoc -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-encoding UTF-8 -breakiterator -licensetext \
-linksource -splitindex -doctitle "GNU libgcj `gij%{gccsuffix}
--version | head -n 2 | tail -n 1 | awk '{ print $5 }'`" \
-windowtitle "GNU libgcj `gij%{gccsuffix} --version | head -n 2 | tail
-n 1 | awk '{ print $5 }'` Documentation"
+ # work around apparent gjdoc/libgcj rounding error that causes a
+ # multilib conflict in Double.html
+ sed -i 's/2.147483647/2.147483648/g'
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/java/lang/Double.html
else
touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
fi
