rpms/jpackage-utils/devel jpackage-utils.spec,1.36,1.37

Tue Jan 22 18:54:18 UTC 2008

Author: fitzsim

Update of /cvs/pkgs/rpms/jpackage-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1254

Modified Files:
	jpackage-utils.spec 
Log Message:
* Mon Jan 21 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.7.3-1jpp.4
- Remove AutoReqProv.
- Remove Requires and BuildRequires.
- Wrap export, install and maven lines at 80 columns.
- Add jre option to java.conf comment.
- Related: rhbz#428520
- Remove commented jpackage.org sections.
- Remove duplicate files from files list.
- Remove trailing whitespace.
- Remove rebuild-security-providers.
- Resolves: rhbz#260161




Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37

--- jpackage-utils.spec	21 Jan 2008 22:01:20 -0000	1.36
+++ jpackage-utils.spec	22 Jan 2008 18:53:31 -0000	1.37
@@ -42,15 +42,8 @@
 Source0:        %{name}-%{version}.tar.bz2
 Patch0:         %{name}-enable-gcj-support.patch
 Group:          Utilities
-# Vendor:         JPackage Project
-# Distribution:   JPackage
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
 BuildArch:      noarch
-AutoReqProv:    no
-BuildRequires:  %{__awk}, %{__grep}
-Requires:       /bin/egrep, /bin/sed, /usr/bin/perl
-Requires:       /bin/bash
 
 %description
 Utilities for the JPackage Project <http://www.jpackage.org/>:
@@ -91,7 +84,6 @@
 It contains also the License, man pages, documentation, XSL files of general
 use with maven2, a header file for spec files etc.
 
-
 %prep
 %setup -q
 %patch0 -p0
@@ -100,7 +92,6 @@
 echo "JPackage release %{distver} (%{distribution}) for %{buildarch}" \
  > etc/jpackage-release
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -111,7 +102,8 @@
     jvmlibdir jvmdatadir jvmsysconfdir \
     jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
     javadir jnidir javadocdir mavendepmapdir; do
-  export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" misc/macros.jpackage | %{__awk} '{ print $2 }'))
+  export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \
+    misc/macros.jpackage | %{__awk} '{ print $2 }'))
 done
 
 install -dm 755 ${RPM_BUILD_ROOT}%{_bindir}
@@ -130,17 +122,24 @@
 install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommondatadir}
 install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-utils
+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-ext
+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.3.1,1.4.0,1.4.1,1.4.2}
+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
-install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.3.1,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0}
-install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{ext,1.3.1,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0,1.7.0}
+install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-ext
+install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.3.1,1.4.0,1.4.1,1.4.2}
+install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
 install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir}
 install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir}
 install -pm 644 etc/font.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/java
 
 # Create an initial (empty) depmap
-echo -e "<dependencies>\\n" > ${RPM_BUILD_ROOT}${_mavendepmapdir}/maven2-depmap.xml
-echo -e "</dependencies>\\n" >> ${RPM_BUILD_ROOT}${_mavendepmapdir}/maven2-depmap.xml
+echo -e "<dependencies>\\n" \
+  > ${RPM_BUILD_ROOT}${_mavendepmapdir}/maven2-depmap.xml
+echo -e "</dependencies>\\n" \
+  >> ${RPM_BUILD_ROOT}${_mavendepmapdir}/maven2-depmap.xml
 
 cat > etc/java.conf << EOF
 # System-wide Java configuration file                                -*- sh -*-
@@ -156,7 +155,15 @@
 # Root of all JVM installations
 JVM_ROOT=${_jvmdir}
 
-# You can define a system-wide JVM root here if you're not using the default one
+# You can define a system-wide JVM root here if you're not using the
+# default one.
+#
+# If you have the a base JRE package installed
+# (e.g. java-1.7.0-icedtea):
+#JAVA_HOME=\$JVM_ROOT/jre
+#
+# If you have the a devel JDK package installed
+# (e.g. java-1.7.0-icedtea-devel):
 #JAVA_HOME=\$JVM_ROOT/java
 
 # Options to pass to the java interpreter
@@ -199,43 +206,23 @@
 %config(noreplace) ${_mavendepmapdir}/maven2-depmap.xml
 EOF
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-# %postun
-# if [ $1 -eq 0 ]; then
-#   for i in "" /redhat /asianux; do
-#     i="%{_libdir}/rpm$i/rpmrc"
-#     if test -f "$i" && egrep -q '^macrofiles:.*%{_sysconfdir}/rpm/macros\.jpackage' "$i"; then
-#       perl -pi -e \
-#         's,^(macrofiles:.*):%{_sysconfdir}/rpm/macros\.jpackage,$1,' "$i"
-#     fi
-#   done
-# fi
-
-# %triggerin -- rpm, redhat-rpm-config, asianux-rpm-config
-# for i in "" /redhat /asianux; do
-#   i="%{_libdir}/rpm$i/rpmrc"
-#   if test -f "$i" && ! egrep -q '^macrofiles:.*%{_sysconfdir}/rpm/macros\.jpackage' "$i"; then
-#     perl -pi -e \
-#       's,^(macrofiles:.*?)(:~/.*)?$,$1:%{_sysconfdir}/rpm/macros\.jpackage$2,' "$i"
-#   fi
-# done
-
-
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
 %doc LICENSE.txt HEADER.JPP doc/* etc/httpd-javadoc.conf
-%if %{gcj_support}
-%{_sysconfdir}/java/security
-%{_sysconfdir}/java/security/security.d
-%endif
-
 
 %changelog
 * Mon Jan 21 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.7.3-1jpp.4
+- Remove AutoReqProv.
+- Remove Requires and BuildRequires.
+- Wrap export, install and maven lines at 80 columns.
+- Add jre option to java.conf comment.
+- Related: rhbz#428520
+- Remove commented jpackage.org sections.
+- Remove duplicate files from files list.
+- Remove trailing whitespace.
 - Remove rebuild-security-providers.
 - Resolves: rhbz#260161
 
@@ -303,13 +290,13 @@
 
 * Wed Dec 15 2004 Robert Ottenhag <support at bea.com> -  0:1.6.2-1jpp
 - Reapply all updates from 1.5.40-1jpp o 1.5.42-1jpp
-  + Add support for splitting the installation of Java VMs/SDK/JREs 
+  + Add support for splitting the installation of Java VMs/SDK/JREs
     according to FHS 2.3 in its architecture dependent, architecture
     independent, and configuration parts. Added new macros and dirs
     - %%{_jvmlibdir}, defined as %%{_libdir}/jvm, equal to %%{_jvmdir},
     - %%{_jvmdatadir}, defined as %%{_datadir}/jvm
     - %%{_jvmsysconfdir}, defined as %%{_sysconfdir}/jvm
-  + Add support for splitting the installation of Java VMs/SDK/JREs 
+  + Add support for splitting the installation of Java VMs/SDK/JREs
     in its common architecture dependent, architecture
     independent, and configuration parts. Added new macros and dirs
     - %%{_jvmcommonlibdir}, defined as %%{_libdir}/jvm-commmon
@@ -404,7 +391,7 @@
 
 * Tue Jun 10 2003 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 0:1.5.22-1jpp
 - more correct java version detection regexp, courtesy of Scott Brickner
-- allow creation of harlink/copy jar repositories since tomcat4 seems to need 
+- allow creation of harlink/copy jar repositories since tomcat4 seems to need
   this (reported by Greg Barton)
 
 * Sun May 18 2003 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 0:1.5.21-1jpp


