SPECS: jpackage-utils.spec - Release: 5 - use PLD rpm macros inste...

[jajcus]

Author: jajcus                       Date: Thu May 25 07:30:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Release: 5
- use PLD rpm macros instead of those provided by jpackage-utils sources

---- Files affected:
SPECS:
   jpackage-utils.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/jpackage-utils.spec
diff -u SPECS/jpackage-utils.spec:1.10 SPECS/jpackage-utils.spec:1.11
--- SPECS/jpackage-utils.spec:1.10	Wed May 24 12:38:42 2006
+++ SPECS/jpackage-utils.spec	Thu May 25 09:30:21 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.6.6
-Release:	4
+Release:	5
 Epoch:		0
 License:	BSD-like
 Group:		Development/Languages/Java
@@ -12,6 +12,7 @@
 # Source0-md5:	85336e72018ecefa2f9999fc4e6f3eb8
 Patch0:		%{name}-pdksh.patch
 URL:		http://www.jpackage.org/
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	/bin/egrep
 Requires:	/bin/sed
 BuildArch:	noarch
@@ -71,22 +72,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for dir in \
-    jvmdir jvmjardir jvmprivdir \
-    jvmlibdir jvmdatadir jvmsysconfdir \
-    jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
-    javadir jnidir javadocdir ; do
-  export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" misc/macros.jpackage | %{__awk} '{ print $2 }'))
-done
-
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,${_jvmdir}} \
-	$RPM_BUILD_ROOT{/etc/env.d,${_jvmdir},${_javadocdir}} \
-	$RPM_BUILD_ROOT{${_jvmjardir},${_jvmprivdir},${_jvmlibdir},${_jvmdatadir}} \
-	$RPM_BUILD_ROOT{${_jvmsysconfdir},${_jvmcommonlibdir},${_jvmcommondatadir}} \
-	$RPM_BUILD_ROOT{${_jvmcommonsysconfdir},${_javadir},${_jnidir}} \
-	$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}
+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}} \
+	$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}
 
 install -pm 755 bin/* $RPM_BUILD_ROOT%{_bindir}
 install -pm 644 etc/font.properties $RPM_BUILD_ROOT%{_sysconfdir}/java
@@ -97,13 +90,13 @@
 # JPackage Project <http://www.jpackage.org/>
 
 # Location of jar files on the system
-JAVA_LIBDIR=${_javadir}
+JAVA_LIBDIR=%{_javadir}
 
 # Location of arch-specific jar files on the system
-JNI_LIBDIR=${_jnidir}
+JNI_LIBDIR=%{_jnidir}
 
 # Root of all JVM installations
-JVM_ROOT=${_jvmdir}
+JVM_ROOT=%{_jvmdir}
 
 # You can define a system-wide JVM root here if you're not using the default one
 #JAVA_HOME=\$JVM_ROOT/java
@@ -114,25 +107,7 @@
 
 install -pm 644 etc/java.conf $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 etc/jpackage-release $RPM_BUILD_ROOT%{_sysconfdir}/java
-install -pm 644 java-utils/* $RPM_BUILD_ROOT${_javadir}-utils
-
-cat <<EOF > %{name}-%{version}.files
-%dir ${_jvmdir}
-%dir ${_jvmjardir}
-%dir ${_jvmprivdir}
-# %dir ${_jvmlibdir}
-%dir ${_jvmdatadir}
-%dir ${_jvmsysconfdir}
-%dir ${_jvmcommonlibdir}
-%dir ${_jvmcommondatadir}
-%dir ${_jvmcommonsysconfdir}
-%dir ${_javadir}
-%dir ${_javadir}-*
-%dir ${_jnidir}
-%dir ${_jnidir}-*
-%dir ${_javadocdir}
-${_javadir}-utils/*
-EOF
+install -pm 644 java-utils/* $RPM_BUILD_ROOT%{_javadir}-utils
 
 cat << EOF >$RPM_BUILD_ROOT/etc/env.d/JAVA_HOME
 JAVA_HOME="`. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME`"
@@ -141,7 +116,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-%{version}.files
+%files
 %defattr(644,root,root,755)
 %doc LICENSE.txt doc/* etc/httpd-javadoc.conf
 %attr(755,root,root) %{_bindir}/*
@@ -150,6 +125,20 @@
 %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/*
+%dir %{_jvmdir}
+%dir %{_jvmjardir}
+%dir %{_jvmprivdir}
+%dir %{_jvmdatadir}
+%dir %{_jvmsysconfdir}
+%dir %{_jvmcommonlibdir}
+%dir %{_jvmcommondatadir}
+%dir %{_jvmcommonsysconfdir}
+%dir %{_javadir}
+%dir %{_javadir}-*
+%dir %{_jnidir}
+%dir %{_jnidir}-*
+%dir %{_javadocdir}
+%{_javadir}-utils/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -157,6 +146,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/05/25 07:30:21  jajcus
+- Release: 5
+- use PLD rpm macros instead of those provided by jpackage-utils sources
+
 Revision 1.10  2006/05/24 10:38:42  jajcus
 - Release: 4
 
================================================================

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