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-Aug-2008 09:44:06
Branch: HEAD Handle: 2008080608440600
Modified files:
openpkg-src/jam jam.patch jam.spec
Log:
modifying package: jam-2.5 20080404 -> 20080806
Summary:
Revision Changes Path
1.2 +16 -17 openpkg-src/jam/jam.patch
1.20 +11 -16 openpkg-src/jam/jam.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/jam/jam.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 jam.patch
--- openpkg-src/jam/jam.patch 19 Jun 2007 09:09:33 -0000 1.1
+++ openpkg-src/jam/jam.patch 6 Aug 2008 07:44:06 -0000 1.2
@@ -1,7 +1,19 @@
-Index: boost-build/jam_src/build.sh
---- boost-build/jam_src/build.sh.orig 2006-02-03 17:57:42 +0100
-+++ boost-build/jam_src/build.sh 2007-06-17 13:54:31 +0200
-@@ -127,7 +127,7 @@
+Index: boost-jam-3.1.16/build.jam
+--- boost-jam-3.1.16/build.jam.orig 2007-12-03 04:27:54 +0100
++++ boost-jam-3.1.16/build.jam 2008-08-06 09:39:12 +0200
+@@ -176,7 +176,7 @@
+ ## GCC 2.x, 3.x, 4.x
+ toolset gcc gcc : "-o " : -D
+ : -pedantic -fno-strict-aliasing
+- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
++ [ opt --release : [ opt --symbols : -g : -s ] -O0 ]
+ [ opt --debug : -g -O0 -fno-inline ]
+ -I$(--python-include) -I$(--extra-include) -Wno-long-long
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+Index: boost-jam-3.1.16/build.sh
+--- boost-jam-3.1.16/build.sh.orig 2007-12-03 04:27:54 +0100
++++ boost-jam-3.1.16/build.sh 2008-08-06 09:38:28 +0200
+@@ -129,7 +129,7 @@
;;
gcc)
@@ -10,16 +22,3 @@
;;
darwin)
-Index: boost-build/jam_src/build.jam
---- boost-build/jam_src/build.jam.orig 2007-06-17 14:07:34 +0200
-+++ boost-build/jam_src/build.jam 2007-06-17 14:08:21 +0200
-@@ -153,7 +153,7 @@
- ## GCC 2.x, 3.x, 4.x
- toolset gcc gcc : "-o " : -D
- : -pedantic
-- [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
-+ [ opt --release : [ opt --symbols : -g : -s ] -O0 ]
- [ opt --debug : -g -O0 -fno-inline ]
- -I$(--python-include) -Wno-long-long
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/jam/jam.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 jam.spec
--- openpkg-src/jam/jam.spec 4 Apr 2008 16:42:32 -0000 1.19
+++ openpkg-src/jam/jam.spec 6 Aug 2008 07:44:06 -0000 1.20
@@ -23,7 +23,7 @@
# package version
%define V_perforce 2.5
-%define V_boost 2.0-m12
+%define V_boost 3.1.16
%define V_freetype 2.5.3rc2
# package information
@@ -37,11 +37,11 @@
Group: Building
License: Freely distributable
Version: %{V_perforce}
-Release: 20080404
+Release: 20080806
# list of sources
-Source0: ftp://ftp.perforce.com/pub/jam/jam-%{V_perforce}.tar
-Source1:
http://switch.dl.sourceforge.net/boost/boost-build-%{V_boost}.tar.bz2
+Source0: ftp://ftp.perforce.com/jam/jam-%{V_perforce}.tar
+Source1: http://switch.dl.sourceforge.net/boost/boost-jam-%{V_boost}.tgz
Source2: http://david.freetype.org/jam/ftjam-%{V_freetype}.tar.bz2
Patch0: jam.patch
@@ -69,13 +69,13 @@
%track
prog jam:jam = {
version = %{V_perforce}
- url = ftp://ftp.perforce.com/pub/jam/
+ url = ftp://ftp.perforce.com/jam/
regex = jam-(__VER__)\.tar
}
prog jam:bjam = {
version = %{V_boost}
- url = http://www.boost.org/doc/tools/build/index.html
- regex = boost-build-(__VER__)\.tar\.bz2
+ url = http://prdownloads.sourceforge.net/boost/
+ regex = boost-jam-(__VER__)\.tgz
}
prog jam:ftjam = {
version = %{V_freetype}
@@ -97,7 +97,7 @@
Makefile
%{l_make} %{l_mflags}
) || exit $?
- ( cd boost-build/jam_src
+ ( cd boost-jam-%{V_boost}
sh ./build.sh
) || exit $?
( cd ftjam-%{V_freetype}
@@ -111,19 +111,14 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/share/jam/bjam
+ $RPM_BUILD_ROOT%{l_prefix}/bin
%{l_shtool} install -c -s -m 755 \
jam-%{V_perforce}/bin.*/jam $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -s -m 755 \
- boost-build/jam_src/bin.*/bjam $RPM_BUILD_ROOT%{l_prefix}/bin/
+ boost-jam-%{V_boost}/bin.*/bjam $RPM_BUILD_ROOT%{l_prefix}/bin/
%{l_shtool} install -c -s -m 755 \
ftjam-%{V_freetype}/bin.unix/jam $RPM_BUILD_ROOT%{l_prefix}/bin/ftjam
- %{l_shtool} install -c -m 644 \
- boost-build/doc/html/jam/*.html
$RPM_BUILD_ROOT%{l_prefix}/share/jam/bjam/
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
- %{l_files_std} \
- '%doc %{l_prefix}/share/jam/bjam/*'
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
