SPECS: jpackage-utils.spec - support 32-bit dirs on archs with lib...

[glen]

Author: glen                         Date: Thu Jan 11 12:41:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- support 32-bit dirs on archs with lib64
- rel 12

---- Files affected:
SPECS:
   jpackage-utils.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/jpackage-utils.spec
diff -u SPECS/jpackage-utils.spec:1.20 SPECS/jpackage-utils.spec:1.21
--- SPECS/jpackage-utils.spec:1.20	Thu Jan 11 13:22:41 2007
+++ SPECS/jpackage-utils.spec	Thu Jan 11 13:41:43 2007
@@ -4,7 +4,7 @@
 Summary(pl):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.6.6
-Release:	11.1
+Release:	12
 Epoch:		0
 License:	BSD-like
 Group:		Development/Languages/Java
@@ -71,14 +71,28 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,/etc/env.d} \
-	$RPM_BUILD_ROOT{%{_jvmdir},%{_javadocdir}} \
-	$RPM_BUILD_ROOT{%{_jvmjardir},%{_jvmprivdir},%{_jvmdatadir}} \
-	$RPM_BUILD_ROOT{%{_jvmsysconfdir},%{_jvmcommonlibdir},%{_jvmcommondatadir}} \
-	$RPM_BUILD_ROOT{%{_jvmcommonsysconfdir},%{_javadir},%{_jnidir}} \
+# arch independant
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,/etc/env.d,%{_javadocdir},%{_javadir}} \
+	$RPM_BUILD_ROOT{%{_jvmsysconfdir},%{_jvmcommondatadir},%{_jvmdatadir},%{_jvmcommonsysconfdir}} \
 	$RPM_BUILD_ROOT%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0} \
-	$RPM_BUILD_ROOT%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0} \
-	$RPM_BUILD_ROOT%{_javadocdir}
+
+# arch dependant
+install -d \
+	$RPM_BUILD_ROOT{%{_jvmdir},%{_jvmjardir},%{_jvmprivdir},%{_jvmcommonlibdir},%{_jnidir}} \
+	$RPM_BUILD_ROOT%{_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0}
+
+%if "%{_lib}" != "lib"
+%define _ujvmdir			%{_prefix}/lib/jvm
+%define _ujvmjardir			%{_prefix}/lib/jvm-exports
+%define _ujvmprivdir		%{_prefix}/lib/jvm-private
+%define _ujvmcommonlibdir	%{_prefix}/lib/jvm-common
+%define _ujnidir			%{_prefix}/lib/java
+%define _ujvmlibdir			%{_prefix}/lib/jvm
+
+install -d \
+	$RPM_BUILD_ROOT{%{_ujvmdir},%{_ujvmjardir},%{_ujvmprivdir},%{_ujvmcommonlibdir},%{_ujnidir}} \
+	$RPM_BUILD_ROOT%{_ujnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0}
+%endif
 
 install -pm 755 bin/* $RPM_BUILD_ROOT%{_bindir}
 install -pm 644 etc/font.properties $RPM_BUILD_ROOT%{_sysconfdir}/java
@@ -130,18 +144,30 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/java.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/font.properties
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
+
+# arch dependant
 %dir %{_jvmdir}
 %dir %{_jvmjardir}
 %dir %{_jvmprivdir}
+%dir %{_jvmcommonlibdir}
+%dir %{_jnidir}
+%dir %{_jnidir}-*
+%if "%{_lib}" != "lib"
+%dir %{_ujvmdir}
+%dir %{_ujvmjardir}
+%dir %{_ujvmprivdir}
+%dir %{_ujvmcommonlibdir}
+%dir %{_ujnidir}
+%dir %{_ujnidir}-*
+%endif
+
+# arch independant
 %dir %{_jvmdatadir}
 %dir %{_jvmsysconfdir}
-%dir %{_jvmcommonlibdir}
 %dir %{_jvmcommondatadir}
 %dir %{_jvmcommonsysconfdir}
 %dir %{_javadir}
 %dir %{_javadir}-*
-%dir %{_jnidir}
-%dir %{_jnidir}-*
 %docdir %{_javadocdir}
 %dir %{_javadocdir}
 %{_javadir}-utils/*
@@ -152,6 +178,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/01/11 12:41:43  glen
+- support 32-bit dirs on archs with lib64
+- rel 12
+
 Revision 1.20  2007/01/11 12:22:41  glen
 - avoid $JAVA_HOME containing errors from set_jvm
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jpackage-utils.spec?r1=1.20&r2=1.21&f=u