rpms/simplyhtml/devel simplyhtml.spec,1.2,1.3
John T. Guthrie III
guthrie at fedoraproject.org
Wed Mar 4 14:36:39 UTC 2009
Author: guthrie
Update of /cvs/extras/rpms/simplyhtml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27207
Modified Files:
simplyhtml.spec
Log Message:
More 64-bit file location fixes.
Index: simplyhtml.spec
===================================================================
RCS file: /cvs/extras/rpms/simplyhtml/devel/simplyhtml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simplyhtml.spec 4 Mar 2009 06:24:21 -0000 1.2
+++ simplyhtml.spec 4 Mar 2009 14:36:09 -0000 1.3
@@ -1,8 +1,9 @@
%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%define multilib_arches ppc64 sparc64 x86_64
Name: simplyhtml
Version: 0.12.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Application and a java component for rich text processing
# All files are GPL except for src/com/sun/demo/ElementTreePanel.java which has
@@ -81,8 +82,13 @@
# clause in its license
pushd src/com/sun/demo
mv ElementTreePanel.java ElementTreePanel.java.BadLicense
-unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \
- ElementTreePanel.java
+%ifarch %{multilib_arches}
+ unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0i.%{_arch}/demo/jfc/Notepad/src.zip \
+ ElementTreePanel.java
+%else
+ unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \
+ ElementTreePanel.java
+%endif
sed -i -e '33 i\
/* for use in SimplyHTML */\
package com.sun.demo;' ElementTreePanel.java
@@ -171,6 +177,8 @@
%changelog
+* Wed Mar 4 2009 John Guthrie <guthrie at counterexample.org> 0:0.12.5-7
+- More 64-bit file location fixes.
* Wed Mar 4 2009 John Guthrie <guthrie at counterexample.org> 0:0.12.5-6
- It turns out that the files for the java-1.6.0-openjdk-demo are placed in
%%{_prefix}/lib, not %%{_libdir}. (This is significant for 64-bit
More information about the fedora-extras-commits
mailing list