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

[John T. Guthrie III]

Author: guthrie

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

Modified Files:
	simplyhtml.spec 
Log Message:
Correcting error in location of where java-1.6.0-openjdk-demo places its files.



Index: simplyhtml.spec
===================================================================
RCS file: /cvs/extras/rpms/simplyhtml/F-10/simplyhtml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simplyhtml.spec	3 Mar 2009 04:05:55 -0000	1.1
+++ simplyhtml.spec	4 Mar 2009 06:24:20 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           simplyhtml
 Version:        0.12.5
-Release:        5%{?dist}
+Release:        6%{?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,7 +81,7 @@
 # clause in its license
 pushd src/com/sun/demo
 mv ElementTreePanel.java ElementTreePanel.java.BadLicense
-unzip %{_libdir}/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \
+unzip %{_prefix}/lib/jvm/java-1.6.0-openjdk-1.6.0.0/demo/jfc/Notepad/src.zip \
   ElementTreePanel.java
 sed -i -e '33 i\
 /* for use in SimplyHTML */\
@@ -171,6 +171,11 @@
 
 
 %changelog
+* 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.