OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 10-Nov-2002 13:33:07
Branch: HEAD Handle: 2002111012330601
Modified files:
openpkg-src/j2ee j2ee.spec
openpkg-web news.txt
Log:
cleanup package
Summary:
Revision Changes Path
1.4 +36 -53 openpkg-src/j2ee/j2ee.spec
1.1984 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/j2ee/j2ee.spec
============================================================
$ cvs diff -u -r1.3 -r1.4 j2ee.spec
--- openpkg-src/j2ee/j2ee.spec 26 Sep 2002 19:47:38 -0000 1.3
+++ openpkg-src/j2ee/j2ee.spec 10 Nov 2002 12:33:07 -0000 1.4
@@ -25,7 +25,7 @@
# package versions
%define V_sunjava 1_3_1
%define V_filesys 1.3.1
-%define V_openpkg 1.3.1.00
+%define V_openpkg 1.3.1
# package information
Name: j2ee
@@ -37,12 +37,12 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20020926
+Release: 20021110
# list of sources
Source0: j2sdkee-%{V_sunjava}-solsparc.sh
Source0: j2sdkee-%{V_sunjava}-linux.tar.gz
-Source3: rc.j2ee
+Source3: rc.%{name}
# build information
Prefix: %{l_prefix}
@@ -68,29 +68,13 @@
distribution.
%prep
- %setup -q -c j2ee -T
+ %setup -q -c %{name} -T
%build
%install
rm -rf $RPM_BUILD_ROOT
- # select vendor source
- pkgfile=""
- pkgdir="j2sdkee%{V_filesys}"
- case "%{l_target}" in
- ix86-linux2.[2-5]* | ix86-freebsd4* )
- pkgfile="j2sdkee-%{V_sunjava}-linux.tar.gz"
- ;;
- sparc64-solaris2.[6-9]*)
- pkgfile="j2sdkee-%{V_sunjava}-solsparc.sh"
- ;;
- esac
- if [ ".$pkgfile" = . ]; then
- echo "Sorry, unsupported architecture '%{l_target}'" 1>&2
- exit 1
- fi
-
# create installation tree
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/bin \
@@ -98,47 +82,46 @@
$RPM_BUILD_ROOT%{l_prefix}/libexec
# unpack vendor distribution
- ( umask 022
- cd $RPM_BUILD_ROOT%{l_prefix}/libexec
- case "%{l_target}" in
- ix86-linux2.[2-5]* | ix86-freebsd4* )
- tar zxf $RPM_SOURCE_DIR/$pkgfile
- ;;
- sparc64-solaris2.[6-9]*)
- echo "yes" | sh $RPM_SOURCE_DIR/$pkgfile \
- >COPYING.32
- ;;
- esac
- mv $pkgdir j2ee
- mv COPYING.32 j2ee/COPYING.32
- )
-
- # fix vendor distribution
- ( cd $RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee/bin
- find . -type f -print | xargs chmod u+w
+ ( umask 022
+ cd $RPM_BUILD_ROOT%{l_prefix}/libexec
+ case "%{l_target}" in
+ ix86-freebsd4* )
+ %{l_gzip} -d -c %{SOURCE j2sdkee-%{V_sunjava}-linux.tar.gz} |\
+ %{l_tar} xf -
+ mv j2sdkee%{V_filesys} %{name}
+ find %{name}/bin -type f -print | xargs chmod u+w
+ brandelf -t Linux \
+ `find %{name}/bin/ -type f -print` \
+ >/dev/null 2>&1 || true
+ ;;
+ ix86-linux2.[2-5]* )
+ %{l_gzip} -d -c %{SOURCE j2sdkee-%{V_sunjava}-linux.tar.gz} |\
+ %{l_tar} xf -
+ mv j2sdkee%{V_filesys} %{name}
+ ;;
+ sparc64-solaris2.[6-9]* )
+ echo "yes" | sh %{SOURCE j2sdkee-%{V_sunjava}-solsparc.sh} >/dev/null
+ mv j2sdkee%{V_filesys} %{name}
+ ;;
+ * )
+ echo "Sorry, unsupported architecture '%{l_target}'" 1>&2
+ exit 1
+ ;;
+ esac
)
- # optionally brand ELF binaries (FreeBSD only)
- case "%{l_target}" in
- ix86-freebsd4* )
- brandelf -t Linux \
- `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee/bin/ -type f -print` \
- >/dev/null 2>&1 || true
- ;;
- esac
-
- # link developer binaries
+ # activate binaries
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- for bin in cleanup j2ee packager setenv.sh \
- cloudscape j2eeadmin realmtool userconfig.sh \
- deploytool runclient verifier; do
- ln -s ../libexec/j2ee/bin/$bin .
+ for bin in cleanup j2ee packager \
+ cloudscape j2eeadmin realmtool \
+ deploytool runclient verifier; do
+ ln -s ../libexec/%{name}/bin/$bin .
done
)
# install run-command script
%{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
- %{SOURCE rc.j2ee} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1983 -r1.1984 news.txt
--- openpkg-web/news.txt 10 Nov 2002 12:21:09 -0000 1.1983
+++ openpkg-web/news.txt 10 Nov 2002 12:33:06 -0000 1.1984
@@ -1,3 +1,4 @@
+10-Nov-2002: Upgraded package: P<j2ee-1.3.1-20021110>
10-Nov-2002: New package: P<j2se14-1.4.1.01-20021110>
10-Nov-2002: Upgraded package: P<j2se-1.3.1-20021110>
10-Nov-2002: Upgraded package: P<ncurses-5.3.20021109-20021110>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
