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: 22-Aug-2008 09:09:59
Branch: HEAD Handle: 2008082208095900
Modified files:
openpkg-src/perl-dbi perl-dbi.spec
Log:
finally align this package to all others by using e.g. with_pgsql and
not with_dbd_pgsql (but keep backward compatibility in place for now)
Summary:
Revision Changes Path
1.298 +67 -30 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.297 -r1.298 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 20 Aug 2008 07:24:14 -0000
1.297
+++ openpkg-src/perl-dbi/perl-dbi.spec 22 Aug 2008 07:09:59 -0000
1.298
@@ -54,16 +54,53 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20080820
+Release: 20080822
# package options
-%option with_dbd_sqlite yes
-%option with_dbd_mysql no
-%option with_dbd_pgsql no
-%option with_dbd_oracle no
-%option with_dbd_sybase no
-%option with_dbd_odbc no
-%option with_dbd_cego no
+%option with_sqlite yes
+%option with_mysql no
+%option with_pgsql no
+%option with_oracle no
+%option with_sybase no
+%option with_odbc no
+%option with_cego no
+
+# package backward compatibility
+%option with_dbd_sqlite no
+%option with_dbd_mysql no
+%option with_dbd_pgsql no
+%option with_dbd_oracle no
+%option with_dbd_sybase no
+%option with_dbd_odbc no
+%option with_dbd_cego no
+%if "%{with_dbd_sqlite}" == "yes"
+%undefine with_sqlite
+%define with_sqlite yes
+%endif
+%if "%{with_dbd_mysql}" == "yes"
+%undefine with_mysql
+%define with_mysql yes
+%endif
+%if "%{with_dbd_pgsql}" == "yes"
+%undefine with_pgsql
+%define with_pgsql yes
+%endif
+%if "%{with_dbd_oracle}" == "yes"
+%undefine with_oracle
+%define with_oracle yes
+%endif
+%if "%{with_dbd_sybase}" == "yes"
+%undefine with_sybase
+%define with_sybase yes
+%endif
+%if "%{with_dbd_odbc}" == "yes"
+%undefine with_odbc
+%define with_odbc yes
+%endif
+%if "%{with_dbd_cego}" == "yes"
+%undefine with_cego
+%define with_cego yes
+%endif
# list of sources
Source0: http://www.cpan.org/modules/by-module/DBI/DBI-%{V_dbi}.tar.gz
@@ -94,31 +131,31 @@
PreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
BuildPreReq: perl-module, perl-util, perl-net, perl-locale, perl-text,
perl-parse
PreReq: perl-module, perl-util, perl-net, perl-locale, perl-text,
perl-parse
-%if "%{with_dbd_sqlite}" == "yes"
+%if "%{with_sqlite}" == "yes"
BuildPreReq: sqlite, perl-locale >= %{V_perl}-20060921
PreReq: sqlite, perl-locale >= %{V_perl}-20060921
%endif
-%if "%{with_dbd_mysql}" == "yes"
+%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
%endif
-%if "%{with_dbd_pgsql}" == "yes"
+%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
%endif
-%if "%{with_dbd_oracle}" == "yes"
+%if "%{with_oracle}" == "yes"
BuildPreReq: oracle
PreReq: oracle
%endif
-%if "%{with_dbd_sybase}" == "yes"
+%if "%{with_sybase}" == "yes"
BuildPreReq: freetds, libiconv
PreReq: freetds, libiconv
%endif
-%if "%{with_dbd_odbc}" == "yes"
+%if "%{with_odbc}" == "yes"
BuildPreReq: ODBC
PreReq: ODBC
%endif
-%if "%{with_dbd_cego}" == "yes"
+%if "%{with_cego}" == "yes"
BuildPreReq: cego
PreReq: cego
%endif
@@ -138,14 +175,14 @@
- DBD::AnyData (%{V_dbd_anydata})
- DBD::CSV (%{V_dbd_csv})
- DBD::Sprite (%{V_dbd_sprite})
- - DBD::SQLite (%{V_dbd_sqlite}) [%{with_dbd_sqlite}]
- - DBD::PgLite (%{V_dbd_pglite}) [%{with_dbd_sqlite}]
- - DBD::mysql (%{V_dbd_mysql}) [%{with_dbd_mysql}]
- - DBD::Pg (%{V_dbd_pgsql}) [%{with_dbd_pgsql}]
- - DBD::Oracle (%{V_dbd_oracle}) [%{with_dbd_oracle}]
- - DBD::Sybase (%{V_dbd_sybase}) [%{with_dbd_sybase}]
- - DBD::ODBC (%{V_dbd_odbc}) [%{with_dbd_odbc}]
- - DBD::Cego (%{V_dbd_cego}) [%{with_dbd_cego}]
+ - DBD::SQLite (%{V_dbd_sqlite}) [%{with_sqlite}]
+ - DBD::PgLite (%{V_dbd_pglite}) [%{with_sqlite}]
+ - DBD::mysql (%{V_dbd_mysql}) [%{with_mysql}]
+ - DBD::Pg (%{V_dbd_pgsql}) [%{with_pgsql}]
+ - DBD::Oracle (%{V_dbd_oracle}) [%{with_oracle}]
+ - DBD::Sybase (%{V_dbd_sybase}) [%{with_sybase}]
+ - DBD::ODBC (%{V_dbd_odbc}) [%{with_odbc}]
+ - DBD::Cego (%{V_dbd_cego}) [%{with_cego}]
%track
prog perl-dbi:DBI = {
@@ -288,7 +325,7 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE9} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE10} configure build install
-%if "%{with_dbd_sqlite}" == "yes"
+%if "%{with_sqlite}" == "yes"
# build DBD::SQLite
( cd DBD-SQLite-%{V_dbd_sqlite}
# remove local SQLite sources (we use external one)
@@ -307,7 +344,7 @@
%{l_prefix}/bin/perl-openpkg -d DBD-PgLite-%{V_dbd_pglite} configure
build install
%endif
-%if "%{with_dbd_mysql}" == "yes"
+%if "%{with_mysql}" == "yes"
# build DBD::mysql
( cd DBD-mysql-%{V_dbd_mysql}
# (determines MySQL header/lib paths via mysql_config in $PATH)
@@ -315,7 +352,7 @@
) || exit $?
%endif
-%if "%{with_dbd_pgsql}" == "yes"
+%if "%{with_pgsql}" == "yes"
# build DBD::Pg
( cd DBD-Pg-%{V_dbd_pgsql}
%{l_shtool} subst \
@@ -329,7 +366,7 @@
) || exit $?
%endif
-%if "%{with_dbd_oracle}" == "yes"
+%if "%{with_oracle}" == "yes"
# build DBD::oracle
( cd DBD-Oracle-%{V_dbd_oracle}
ORACLE_HOME="`%{l_rc} --query oracle_home`"
@@ -352,7 +389,7 @@
) || exit $?
%endif
-%if "%{with_dbd_sybase}" == "yes"
+%if "%{with_sybase}" == "yes"
# build DBD::Sybase
( cd DBD-Sybase-%{V_dbd_sybase}
SYBASE="%{l_prefix}"
@@ -365,7 +402,7 @@
) || exit $?
%endif
-%if "%{with_dbd_odbc}" == "yes"
+%if "%{with_odbc}" == "yes"
# build DBD::odbc
( cd DBD-ODBC-%{V_dbd_odbc}
ODBCHOME="%{l_prefix}"
@@ -375,7 +412,7 @@
) || exit $?
%endif
-%if "%{with_dbd_cego}" == "yes"
+%if "%{with_cego}" == "yes"
# build DBD::Cego
( cd DBD-cego
rm -f ._* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
