OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael van Elst
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web openpkg$ Date:   23-Jun-2003 15:50:46
  Branch: HEAD                             Handle: 2003062314504401

  Modified files:
    openpkg-re/vcheck       vc.perl-dbi
    openpkg-src/perl-dbi    perl-dbi.patch perl-dbi.spec
    openpkg-web             news.txt

  Log:
    add optional DBD::ODBC

  Summary:
    Revision    Changes     Path
    1.48        +5  -0      openpkg-re/vcheck/vc.perl-dbi
    1.3         +11 -0      openpkg-src/perl-dbi/perl-dbi.patch
    1.65        +21 -2      openpkg-src/perl-dbi/perl-dbi.spec
    1.4954      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.perl-dbi
  ============================================================================
  $ cvs diff -u -r1.47 -r1.48 vc.perl-dbi
  --- openpkg-re/vcheck/vc.perl-dbi     3 Jun 2003 08:32:32 -0000       1.47
  +++ openpkg-re/vcheck/vc.perl-dbi     23 Jun 2003 13:50:44 -0000      1.48
  @@ -11,6 +11,11 @@
     url       = http://www.cpan.org/modules/by-module/DBD/
     regex     = DBD-mysql-(__VER__)\.tar\.gz
   }
  +prog perl-dbi:DBD-ODBC = {
  +  version   = 1.06
  +  url       = http://www.cpan.org/modules/by-module/DBD/
  +  regex     = DBD-ODBC-(__VER__)\.tar\.gz
  +}
   prog perl-dbi:DBD-Oracle = {
     version   = 1.14
     url       = http://www.cpan.org/modules/by-module/DBD/
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-dbi/perl-dbi.patch
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 perl-dbi.patch
  --- openpkg-src/perl-dbi/perl-dbi.patch       28 May 2003 11:56:51 -0000      1.2
  +++ openpkg-src/perl-dbi/perl-dbi.patch       23 Jun 2003 13:50:45 -0000      1.3
  @@ -148,3 +148,14 @@
    };
    
    /* Define sth implementor data structure */
  +--- DBD-ODBC-1.06/Makefile.PL.dist   2003-06-23 15:42:09.000000000 +0200
  ++++ DBD-ODBC-1.06/Makefile.PL        2003-06-23 15:42:23.000000000 +0200
  +@@ -424,7 +424,7 @@
  + changes_pm = ' . File::Spec->catfile($self->{INST_LIB}, 'DBD/ODBC', 'Changes.pm') 
. '
  + 
  + config :: $(changes_pm)
  +-    @$(NOOP)
  ++    @$(NOOP)
  + 
  + $(changes_pm): Changes
  +     $(NOECHO) $(MKPATH) $(inst_libdbdodbc)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perl-dbi/perl-dbi.spec
  ============================================================================
  $ cvs diff -u -r1.64 -r1.65 perl-dbi.spec
  --- openpkg-src/perl-dbi/perl-dbi.spec        3 Jun 2003 08:32:34 -0000       1.64
  +++ openpkg-src/perl-dbi/perl-dbi.spec        23 Jun 2003 13:50:45 -0000      1.65
  @@ -32,6 +32,7 @@
   %define       V_dbd_mysql      2.1027
   %define       V_dbd_pg         1.22
   %define       V_dbd_oracle     1.14
  +%define       V_dbd_odbc       1.06
   
   #   package information
   Name:         perl-dbi
  @@ -42,13 +43,14 @@
   Distribution: OpenPKG [BASE]
   Group:        Language
   License:      GPL/Artistic
  -Version:      20030603
  -Release:      20030603
  +Version:      20030623
  +Release:      20030623
   
   #   package options
   %option       with_dbd_mysql   no
   %option       with_dbd_pg      no
   %option       with_dbd_oracle  no
  +%option       with_dbd_odbc    no
   
   #   list of sources
   Source0:      http://www.cpan.org/modules/by-module/DBI/DBI-%{V_dbi}.tar.gz
  @@ -59,6 +61,7 @@
   Source5:      
http://www.cpan.org/modules/by-module/DBD/DBD-mysql-%{V_dbd_mysql}.tar.gz
   Source6:      http://www.cpan.org/modules/by-module/DBD/DBD-Pg-%{V_dbd_pg}.tar.gz
   Source7:      
http://www.cpan.org/modules/by-module/DBD/DBD-Oracle-%{V_dbd_oracle}.tar.gz
  +Source8:      
http://www.cpan.org/modules/by-module/DBD/DBD-ODBC-%{V_dbd_odbc}.tar.gz
   Patch0:       perl-dbi.patch
   
   #   build information
  @@ -78,6 +81,10 @@
   BuildPreReq:  ORACLE
   PreReq:       ORACLE
   %endif
  +%if "%{with_dbd_odbc}" == "yes"
  +BuildPreReq:  unixodbc
  +PreReq:       unixodbc
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -91,6 +98,7 @@
       - DBD::mysql (%{V_dbd_mysql}) [%{with_dbd_mysql}]
       - DBD::Pg (%{V_dbd_pg}) [%{with_dbd_pg}]
       - DBD::Oracle (%{V_dbd_oracle}) [%{with_dbd_oracle}]
  +    - DBD::ODBC (%{V_dbd_odbc}) [%{with_dbd_odbc}]
   
   %prep
       %setup0 -q -c
  @@ -101,6 +109,7 @@
       %setup5 -q -T -D -a 5
       %setup6 -q -T -D -a 6
       %setup7 -q -T -D -a 7
  +    %setup8 -q -T -D -a 8
       %patch0 -p0
   
   %build
  @@ -139,6 +148,16 @@
       ( cd DBD-Oracle-%{V_dbd_oracle}
         ORACLE_HOME="`%{l_prefix}/etc/rc --query oracle_home`"
         export ORACLE_HOME
  +      %{l_prefix}/bin/perl-openpkg install
  +    )
  +%endif
  +
  +%if "%{with_dbd_odbc}" == "yes"
  +    #   build DBD::odbc
  +    ( cd DBD-ODBC-%{V_dbd_odbc}
  +      ODBCHOME="%{l_prefix}"
  +      DBROOT=
  +      export ODBCHOME DBROOT
         %{l_prefix}/bin/perl-openpkg install
       )
   %endif
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.4953 -r1.4954 news.txt
  --- openpkg-web/news.txt      23 Jun 2003 11:10:19 -0000      1.4953
  +++ openpkg-web/news.txt      23 Jun 2003 13:50:44 -0000      1.4954
  @@ -1,3 +1,4 @@
  +23-Jun-2003: Upgraded package: P<perl-dbi-20030623-20030623>
   23-Jun-2003: Upgraded package: P<monit-3.2-20030623>
   23-Jun-2003: Upgraded package: P<rt-3.0.3-20030623>
   23-Jun-2003: Upgraded package: P<mhonarc-2.6.4-20030623>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to