OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Sep-2002 18:03:57
Branch: HEAD Handle: 2002092617035700
Modified files:
openpkg-src/j2se j2se.spec
Log:
Corrected buildconf, and rolled package.
Summary:
Revision Changes Path
1.3 +14 -69 openpkg-src/j2se/j2se.spec
____________________________________________________________________________
Index: openpkg-src/j2se/j2se.spec
============================================================
$ cvs diff -u -r1.2 -r1.3 j2se.spec
--- openpkg-src/j2se/j2se.spec 25 Sep 2002 17:13:58 -0000 1.2
+++ openpkg-src/j2se/j2se.spec 26 Sep 2002 16:03:57 -0000 1.3
@@ -37,7 +37,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20020925
+Release: 20020926
# list of sources
Source0: j2sdk-%{V_sunjava}-linux-i586.bin
@@ -69,7 +69,7 @@
%install
rm -rf $RPM_BUILD_ROOT
- # vendor source selection
+ # select vendor source
pkgfile=""
suppfile=""
pkgdir=%{V_filesys}
@@ -92,70 +92,10 @@
# create installation tree
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/lib \
- $RPM_BUILD_ROOT%{l_prefix}/include \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec \
$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
- $RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc \
- $RPM_BUILD_ROOT%{l_prefix}/jre/bin \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/applet \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/ext \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/security \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/fonts \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/images/cursors \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/audio \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Africa \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/America/Indiana \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/America/North_Dakota \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/America/Kentucky \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Antarctica \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Asia \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Atlantic \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Australia \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Etc \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Europe \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Indian \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/zi/Pacific \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/cmm \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/im \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/de/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/es/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/fr/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/it/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/ja/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/ko/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/ko.UTF-8/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/sv/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh.GBK/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh_TW/LC_MESSAGES \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
-
- case "%{l_target}" in
- ix86-linux2.[2-5]* | ix86-freebsd4* )
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/include/linux \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/i386/native_threads \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/i386/server \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/i386/client
- ;;
- sparc64-solaris2.[6-9]*)
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin/sparcv9 \
- $RPM_BUILD_ROOT%{l_prefix}/include/solaris \
- $RPM_BUILD_ROOT%{l_prefix}/jre/bin/sparcv9 \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/native_threads \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/server \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/client \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/motif21 \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparc/headless \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/native_threads \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/server \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/motif21 \
- $RPM_BUILD_ROOT%{l_prefix}/jre/lib/sparcv9/headless
- ;;
- esac
+ $RPM_BUILD_ROOT%{l_prefix}/share/j2se/doc
# unpack vendor distribution
( umask 022
@@ -171,7 +111,7 @@
mv $pkgdir j2se
)
- # cleanup vendor distribution
+ # fix vendor distribution
( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin
find . -type f -print | xargs chmod u+w
cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin
@@ -198,15 +138,20 @@
;;
esac
- # strip installation area
+ # clean out installation area
rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/demo 2>/dev/null || true
- # reduce man pages to essential ones and move to final location
- cp $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/*man1/* \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
+ # reduce man pages to essential ones and move them to final location
+ if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1 ]; then
+ cp $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/man/sman1 ]; then
+ cp $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/man 2>/dev/null || true
- # activate binaries
+ # link developer binaries
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for bin in appletviewer extcheck idlj jar jarsigner java \
java-rmi.cgi javac javadoc javah javap jdb keytool native2ascii \
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
