SPECS: java3d.spec - proper java_home (with jpackage support)

[qboosh]

Author: qboosh                       Date: Sun Apr 29 22:24:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- proper java_home (with jpackage support)

---- Files affected:
SPECS:
   java3d.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/java3d.spec
diff -u SPECS/java3d.spec:1.6 SPECS/java3d.spec:1.7
--- SPECS/java3d.spec:1.6	Tue Feb 13 09:06:36 2007
+++ SPECS/java3d.spec	Mon Apr 30 00:23:57 2007
@@ -17,6 +17,7 @@
 NoSource:	1
 NoSource:	2
 URL:		https://java3d.dev.java.net/
+BuildRequires:	jpackage-utils
 Requires:	OpenGL >= 1.2
 Requires:	OpenGL-GLX >= 1.3
 Requires:	jre >= 1.4.2
@@ -52,13 +53,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/java/jre
+install -d $RPM_BUILD_ROOT%{java_home}/jre
 
 %ifarch %{ix86}
-unzip j3d-132-linux-x86.zip -d $RPM_BUILD_ROOT%{_libdir}/java/jre
+unzip j3d-132-linux-x86.zip -d $RPM_BUILD_ROOT%{java_home}/jre
 %endif
 %ifarch %{x8664}
-unzip j3d-132-linux-amd64.zip -d $RPM_BUILD_ROOT%{_libdir}/java/jre
+unzip j3d-132-linux-amd64.zip -d $RPM_BUILD_ROOT%{java_home}/jre
 %endif
 
 %clean
@@ -68,12 +69,12 @@
 %defattr(644,root,root,755)
 %doc BINARY-CODE-LICENSE.txt COPYRIGHT.txt RELEASE-NOTES.html
 %ifarch %{ix86}
-%attr(755,root,root) %{_libdir}/java/jre/lib/i386/lib*.so
+%attr(755,root,root) %{java_home}/jre/lib/i386/lib*.so
 %endif
 %ifarch %{x8664}
-%attr(755,root,root) %{_libdir}/java/jre/lib/amd64/lib*.so
+%attr(755,root,root) %{java_home}/jre/lib/amd64/lib*.so
 %endif
-%{_libdir}/java/jre/lib/ext/*.jar
+%{java_home}/jre/lib/ext/*.jar
 
 %files doc
 %defattr(644,root,root,755)
@@ -85,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/04/29 22:23:57  qboosh
+- proper java_home (with jpackage support)
+
 Revision 1.6  2007/02/13 08:06:36  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java3d.spec?r1=1.6&r2=1.7&f=u