OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2005 18:10:17
Branch: HEAD Handle: 2005042117101700
Modified files:
openpkg-src/j2se j2se.spec rc.j2se
Log:
simplify conflicting path logic, handle Solaris sman pathnames, and
correctly set runtime variables
Summary:
Revision Changes Path
1.56 +10 -13 openpkg-src/j2se/j2se.spec
1.12 +4 -4 openpkg-src/j2se/rc.j2se
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/j2se.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 j2se.spec
--- openpkg-src/j2se/j2se.spec 20 Apr 2005 15:44:02 -0000 1.55
+++ openpkg-src/j2se/j2se.spec 21 Apr 2005 16:10:17 -0000 1.56
@@ -40,7 +40,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20050420
+Release: 20050421
# package options
%option with_demo no
@@ -186,22 +186,19 @@
;;
esac
- # remove nonenglish man pages
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/ja*
-
- # move man pages conflicting with Kerberos
- mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/kinit.1 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/j2se-kinit.1
- mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/klist.1 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/j2se-klist.1
- mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/ktab.1 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/j2se-ktab.1
-
- # move man pages to a canonical location
+ # rename conflicting man pages, and move man pages to a canonical
location
if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/man1
]; then
+ for manpage in kinit.1 klist.1 ktab.1; do
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/$manpage \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/j2se-$manpage
+ done
mv
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/man1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/
elif [ -d
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/sman1 ]; then
+ for manpage in kinit.1 klist.1 ktab.1; do
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1/$manpage \
+
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1/j2se-$manpage
+ done
mv
$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man/sman1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/rc.j2se
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.j2se
--- openpkg-src/j2se/rc.j2se 19 Apr 2005 17:15:53 -0000 1.11
+++ openpkg-src/j2se/rc.j2se 21 Apr 2005 16:10:17 -0000 1.12
@@ -5,9 +5,9 @@
%config
j2se_enable="$openpkg_rc_def"
- j2se_home="@l_prefix@/libexec/j2se/@javer@"
- JRE_home=$j2se_home
- JDK_home=$j2se_home
+ j2se_home="@l_prefix@/libexec/j2se"
+ JRE_home="${j2se_home}/jre"
+ JDK_home="$j2se_home"
%status -u root -o
j2se_usable="unknown"
@@ -19,6 +19,6 @@
%env
rcService j2se enable yes || exit 0
- JAVA_HOME="$JDK_home"
+ JAVA_HOME="$JRE_home"
export JAVA_HOME
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
