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: 25-Apr-2005 19:36:31
Branch: HEAD Handle: 2005042518363100
Modified files:
openpkg-src/j2se j2se.spec
Log:
even more path corrections, and add again conflicting manpage logic
but do so conditionally (to accommodate Sun's inconsistent
installation procedures
Summary:
Revision Changes Path
1.57 +18 -18 openpkg-src/j2se/j2se.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/j2se.spec
============================================================================
$ cvs diff -u -r1.56 -r1.57 j2se.spec
--- openpkg-src/j2se/j2se.spec 21 Apr 2005 16:10:17 -0000 1.56
+++ openpkg-src/j2se/j2se.spec 25 Apr 2005 17:36:31 -0000 1.57
@@ -40,7 +40,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20050421
+Release: 20050425
# package options
%option with_demo no
@@ -186,23 +186,23 @@
;;
esac
- # 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/* \
+ # move man pages to a canonical location
+ if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1 ]; then
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/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/* \
+ elif [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1 ]; then
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/sman1/* \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/
fi
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/man
2>/dev/null || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man 2>/dev/null || true
+
+ # conditionally rename conflicting man pages
+ for manpage in kinit.1 klist.1 ktab.1; do
+ if [ -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/$manpage ]; then
+ mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/$manpage \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1/j2se-$manpage
+ fi
+ done
# remove GNOME and other irrelevant files
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/.gnome
@@ -210,13 +210,13 @@
# conditionally remove demo
%if "%{with_demo}" == "no"
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/demo
2>/dev/null || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true
%endif
# conditionally install docs
%if "%{with_docs}" == "yes"
unzip -q $docsfile
- mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jdk%{V_filesys}/
+ mv docs $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/
%endif
# install Java Cryptography Extension (JCE) Unlimited Strength
Jurisdiction Policy
@@ -243,7 +243,7 @@
ln -s ../libexec/j2se/jdk%{V_filesys}/bin/java-rmi.cgi java-rmi.cgi
) || exit $?
- # install run-command script
+ # install run command script
%{l_shtool} install \
-c -m 755 %{l_value -s -a} \
-e 's;@javer@;jdk%{V_filesys};' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
