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: 05-Aug-2008 21:06:54
Branch: HEAD Handle: 2008080520065400
Modified files:
openpkg-src/spread spread.spec
Log:
fix Spread Perl module building and add two additional modules
Summary:
Revision Changes Path
1.50 +20 -5 openpkg-src/spread/spread.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spread/spread.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 spread.spec
--- openpkg-src/spread/spread.spec 1 Jan 2008 15:05:10 -0000 1.49
+++ openpkg-src/spread/spread.spec 5 Aug 2008 19:06:54 -0000 1.50
@@ -22,8 +22,10 @@
##
# package version
-%define V_spread 4.0.0
-%define V_spread_perl 3.17.3_108
+%define V_spread 4.0.0
+%define V_spread_perl 3.17.3_108
+%define V_spread_perl_client_constant 0.02
+%define V_spread_perl_client 0.03_02
# package information
Name: spread
@@ -36,7 +38,7 @@
Group: RPC
License: BSD-style
Version: %{V_spread}
-Release: 20080101
+Release: 20080805
# package options
%option with_perl no
@@ -45,7 +47,9 @@
# list of sources
Source0: http://www.spread.org/download/::/spread-src-%{V_spread}.tar.gz
Source1:
http://www.cpan.org/authors/id/J/JE/JESUS/Spread-%{V_spread_perl}.tar.gz
-Source2: rc.spread
+Source2:
http://www.cpan.org/authors/id/M/MB/MBAILEY/Spread-Client-Constant-%{V_spread_perl_client_constant}.tar.gz
+Source3:
http://www.cpan.org/authors/id/M/MB/MBAILEY/Spread-Client-%{V_spread_perl_client}.tar.gz
+Source4: rc.spread
# build information
Prefix: %{l_prefix}
@@ -86,6 +90,8 @@
%setup -q -n spread-src-%{version}
%if "%{with_perl}" == "yes"
%setup -q -n spread-src-%{version} -D -T -a 1
+ %setup -q -n spread-src-%{version} -D -T -a 2
+ %setup -q -n spread-src-%{version} -D -T -a 3
%endif
# adjust paths in toolkit
@@ -101,8 +107,13 @@
daemon/auth-ip.c
%if "%{with_perl}" == "yes"
%{l_shtool} subst \
- -e 's;\.\./spread-src-3.17.0/;../include;' \
+ -e 's;\(SPLIB_LIB.*\)\.\./spread-src-3.17.0/;\1../libspread;' \
+ -e 's;\(SPLIB_INCLUDE.*\)\.\./spread-src-3.17.0/;\1../include;' \
Spread-%{V_spread_perl}/Makefile.PL
+ %{l_shtool} subst \
+ -e 's;\(LIBS.*\[.\)\(.\);\1-L../libspread -lspread\2;' \
+ -e 's;-I\.;-I../include;' \
+ Spread-Client-Constant-%{V_spread_perl_client_constant}/Makefile.PL
%endif
%build
@@ -130,6 +141,8 @@
# build Perl extension
%if "%{with_perl}" == "yes"
%{l_prefix}/bin/perl-openpkg -d Spread-%{V_spread_perl} prepare
configure build
+ %{l_prefix}/bin/perl-openpkg -d
Spread-Client-Constant-%{V_spread_perl_client_constant} prepare configure build
+ %{l_prefix}/bin/perl-openpkg -d Spread-Client-%{V_spread_perl_client}
prepare configure build
%endif
# build Java extension
@@ -145,6 +158,8 @@
# install Perl extension
%if "%{with_perl}" == "yes"
%{l_prefix}/bin/perl-openpkg -d Spread-%{V_spread_perl} install
+ %{l_prefix}/bin/perl-openpkg -d
Spread-Client-Constant-%{V_spread_perl_client_constant} install
+ %{l_prefix}/bin/perl-openpkg -d Spread-Client-%{V_spread_perl_client}
install
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%else
>perl-openpkg-files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
