OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Oct-2007 10:01:50
Branch: HEAD Handle: 2007100609014900
Modified files:
openpkg-src/java-jdk16 java-jdk16.spec
Log:
shift up to FreeBSD 7
Summary:
Revision Changes Path
1.5 +6 -6 openpkg-src/java-jdk16/java-jdk16.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/java-jdk16/java-jdk16.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 java-jdk16.spec
--- openpkg-src/java-jdk16/java-jdk16.spec 3 Oct 2007 15:40:48 -0000
1.4
+++ openpkg-src/java-jdk16/java-jdk16.spec 6 Oct 2007 08:01:49 -0000
1.5
@@ -40,7 +40,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20071003
+Release: 20071006
# package options
%option with_demo no
@@ -108,11 +108,11 @@
cryptfile="%{SOURCE jce_policy-%{V_sunsupp}.zip}"
pkgdir="%{V_sunfsys}"
case "%{l_platform -t}" in
- i?86-linux2.[2-6]* | i?86-freebsd[456]* )
+ i?86-linux2.[2-6]* | i?86-freebsd[567]* )
pkgfile1="%{SOURCE jdk-%{V_sundist}-linux-i586.bin}"
pkgdir="jdk%{V_sunfsys}"
;;
- amd64-linux2.[2-6]* | amd64-freebsd[456]* )
+ amd64-linux2.[2-6]* | amd64-freebsd[567]* )
pkgfile1="%{SOURCE jdk-%{V_sundist}-linux-i586.bin}"
pkgfile2="%{SOURCE jdk-%{V_sundist}-linux-amd64.bin}"
pkgdir="jdk%{V_sunfsys}"
@@ -149,10 +149,10 @@
cd $RPM_BUILD_ROOT%{l_prefix}/libexec
HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/java-jdk16
case "%{l_platform -t}" in
- i?86-linux2.[2-6]* | i?86-freebsd[456]* )
+ i?86-linux2.[2-6]* | i?86-freebsd[567]* )
echo "yes" | sh $pkgfile1 >COPYING.32
;;
- amd64-linux2.[2-6]* | amd64-freebsd[456]* )
+ amd64-linux2.[2-6]* | amd64-freebsd[567]* )
echo "yes" | sh $pkgfile1 >COPYING.32
echo "yes" | sh $pkgfile2 >COPYING.64
;;
@@ -222,7 +222,7 @@
# optionally brand ELF binaries (FreeBSD only)
case "%{l_platform -t}" in
- *-freebsd[456]* )
+ *-freebsd[567]* )
brandelf -t Linux \
`find $RPM_BUILD_ROOT%{l_prefix}/libexec/java-jdk16/bin/
-type f -print` \
>/dev/null 2>&1 || true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
