[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/yaml/ yaml.spec
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2009-11-27 12:51:38
Message-ID: 20091127125139.138241B5047 () master ! openpkg ! org
[Download RAW message or body]

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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   27-Nov-2009 13:51:38
  Branch: HEAD                             Handle: 2009112712513800

  Modified files:
    openpkg-src/yaml        yaml.spec

  Log:
    fix PHP bindings

  Summary:
    Revision    Changes     Path
    1.87        +16 -8      openpkg-src/yaml/yaml.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/yaml/yaml.spec
  ============================================================================
  $ cvs diff -u -r1.86 -r1.87 yaml.spec
  --- openpkg-src/yaml/yaml.spec	27 Nov 2009 12:45:26 -0000	1.86
  +++ openpkg-src/yaml/yaml.spec	27 Nov 2009 12:51:38 -0000	1.87
  @@ -36,6 +36,7 @@
   %define       V_yaml_spec           2004-12-28
   %define       V_java_jvyaml         0.2.1
   %define       V_java_jyaml          1.3
  +%define       V_php_syck            0.9.3
   
   #   package information
   Name:         yaml
  @@ -70,14 +71,15 @@
   Source10:     https://jvyaml.dev.java.net/files/documents/5215/41455/jvyaml-src-%{V_java_jvyaml}.tar.gz
  Source11:     http://switch.dl.sourceforge.net/jyaml/jyaml-src-%{V_java_jyaml}.tgz
   Source12:     http://www.cpan.org/authors/id/E/EI/EIDOLON/YAML-Object-%{V_perl_yaml_object}.tar.gz
                
  -Source13:     http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
  -Source14:     yaml.yml
  +Source13:     http://pecl.php.net/get/syck-%{V_php_syck}.tgz
  +Source14:     http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
  +Source15:     yaml.yml
   Patch0:       yaml.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20040130, make
  +BuildPreReq:  OpenPKG, openpkg >= 20040130, make, bison
   PreReq:       OpenPKG, openpkg >= 20040130
   %if "%{with_perl}" == "yes"
   BuildPreReq:  perl, perl-openpkg, perl-module
  @@ -178,6 +180,11 @@
           url       = http://www.cpan.org/authors/id/E/EI/EIDOLON/
           regex     = YAML-Object-(__VER__)\.tar\.gz
       }
  +    prog yaml:PHP-Syck = {
  +        version   = %{V_php_syck}
  +        url       = http://pecl.php.net/package/syck
  +        regex     = syck-(__VER__)\.tgz
  +    }
   
   %prep
       %setup -q -c
  @@ -193,6 +200,7 @@
       %setup -q -T -D -a 10
       %setup -q -T -D -a 11
       %setup -q -T -D -a 12
  +    %setup -q -T -D -a 13
       %patch -p0
   
   %build
  @@ -218,14 +226,14 @@
   
       #   build PHP API
   %if "%{with_php}" == "yes"
  -    ( cd syck-%{V_libsyck}/ext/php
  +    ( cd syck-%{V_php_syck}
         %{l_prefix}/bin/phpize
         CC="%{l_cc}" \
         CFLAGS="%{l_cflags -O}" \
  -      CPPFLAGS="-I`pwd`/../../lib" \
  -      LDFLAGS="-L`pwd`/../../lib" \
  +      CPPFLAGS="-I`pwd`/../syck-%{V_libsyck}/lib" \
  +      LDFLAGS="-L`pwd`/../syck-%{V_libsyck}/lib" \
         ./configure \
  -          --with-syck=`pwd`/../..
  +          --with-syck=`pwd`/../syck-%{V_libsyck}
       ) || exit $?
   %endif
   
  @@ -275,7 +283,7 @@
   
       #   install PHP API
   %if "%{with_php}" == "yes"
  -    ( cd syck-%{V_libsyck}/ext/php
  +    ( cd syck-%{V_php_syck}
         %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
       ) || exit $?
   %endif
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org


[prev in list] [next in list] [prev in thread] [next in thread]