rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.171, 1.172
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Sep 7 20:37:07 UTC 2006
Author: fitzsim
Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13599
Modified Files:
java-1.4.2-gcj-compat.spec
Log Message:
* Thu Sep 7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.107
- Give aotcompile.py a consistent timestamp. (205216)
Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- java-1.4.2-gcj-compat.spec 6 Sep 2006 14:58:45 -0000 1.171
+++ java-1.4.2-gcj-compat.spec 7 Sep 2006 20:37:04 -0000 1.172
@@ -27,7 +27,7 @@
Name: java-%{javaver}-%{origin}-compat
Version: %{javaver}.%{buildver}
-Release: 40jpp.106
+Release: 40jpp.107
Epoch: 0
Summary: JPackage runtime scripts for GCJ
@@ -163,6 +163,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
@@ -647,6 +654,9 @@
# %defattr(-,root,root)
%changelog
+* Thu Sep 7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.107
+- Give aotcompile.py a consistent timestamp. (205216)
+
* Wed Sep 6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.106
- Bump release number.
More information about the fedora-cvs-commits
mailing list