rpms/simplyhtml/F-10 simplyhtml.spec,1.2,1.3

[John T. Guthrie III]

Author: guthrie

Update of /cvs/extras/rpms/simplyhtml/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2771

Modified Files:
	simplyhtml.spec 
Log Message:
Importing spec file from devel.



Index: simplyhtml.spec
===================================================================
RCS file: /cvs/extras/rpms/simplyhtml/F-10/simplyhtml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- simplyhtml.spec	4 Mar 2009 06:24:20 -0000	1.2
+++ simplyhtml.spec	5 Mar 2009 07:35:07 -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:        9%{?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
@@ -27,7 +28,7 @@
 BuildRequires:  ant
 BuildRequires:  gnu-regexp
 BuildRequires:  javahelp2
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
 %if %{with_gcj}
 BuildRequires:  java-gcj-compat-devel >= 1.0.31
@@ -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.0.%{_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,14 +177,26 @@
 
 
 %changelog
+* Wed Mar  5 2009 John Guthrie <guthrie at counterexample.org> 0:0.12.5-9
+- Adding a version specification to the java-devel BuildRequirement so that
+  java-1.6.0-openjdk-devel-1.6.0.0 will get included in the build environment.
+
+* Wed Mar  4 2009 John Guthrie <guthrie at counterexample.org> 0:0.12.5-8
+- Typo fix in spec file.
+
+* 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
   architectures.) The appropriate line to unzip the ElementTreePanel.java file
   out of the needed zip file was fixed.
+
 * Wed Feb 25 2009 John Guthrie <guthrie at counterexample.org> 0:0.12.5-5
 - Fixed the perms on the simplyhtml.sh source file.  Allowing the %%attr to
   take care of the perms.
+
 * Thu Feb 12 2009 John Guthrie <guthrie at counterexample.org> 0:0.12.5-4
 - Replaced the version of ElementTreePanel.java that came with the source code
   with a version that has an acceptable license.  Added java-1.6.0-openjdk-demo