- add _javadir/_javadocdir/_javaclasspath macros.

CVS patchset: 5845
CVS date: 2002/11/09 19:25:13

diff --git a/macros.in b/macros.in
index 9bf312f..bbdd733 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: @RPMCONFIGDIR@/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.125 2002/10/24 21:36:13 jbj Exp $
+# $Id: macros.in,v 1.126 2002/11/09 19:25:14 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -252,6 +252,16 @@ package or when debugging this package. \
 #      
 %_install_langs        all
 
+#      The value of CLASSPATH in build scriptlets (iff configured).
+#      
+#%_javaclasspath       all
+
+#      Import packaging conventions from jpackage.org (prefixed with _
+#      to avoid name collisions).
+#      
+%_javadir      %{_datadir}/java
+%_javadocdir   %{_datadir}/javadoc
+
 #
 #      Deprecated.
 #
@@ -708,6 +718,8 @@ package or when debugging this package. \
   export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
   %{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
   export RPM_BUILD_ROOT}\
+  %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+  export CLASSPATH}\
   \
   %{verbose:set -x}%{!verbose:exec > /dev/null}\
   umask 022\

diff --git a/rpm.spec.in b/rpm.spec.in
index ba98132..65ed0bb 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -16,7 +16,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.6
+Release: 0.7
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -184,10 +184,10 @@ fi
 # for f in elflint file ld nm readelf size strip; do
 #  rm -rf .%{__prefix}/bin/$f
 # done
-# for f in dwarf.h elf-knowledge.h fmagic gelf.h libasm.h libdwarf.h libebl.h libelf.h nlist.h; do
+# for f in elfutils; do
 #  rm -rf .%{__prefix}/include/$f
 # done
-# for f in libasm libdwarf libebl libelf libfmagic libld; do
+# for f in libebl elfutils; do
 #  rm -rf .%{__prefix}/lib/${f}*
 # done
 # rm -f .%{__prefix}/share/man/man1/file.1*
@@ -482,6 +482,9 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Sat Nov  9 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.7
+- add _javadir/_javadocdir/_javaclasspath macros.
+
 * Fri Nov  8 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.6
 - fix: /dev/initctl has not MD5 segfault (#76718).
 - rpm.8: gpg uses GNUPGHOME, not GPGPATH (#76691).