OpenPKG Specs / changeset

     1.1 --- a/yaml/yaml.patch	Wed Feb 08 20:14:10 2012 +0200
     1.2 +++ b/yaml/yaml.patch	Tue Aug 28 18:50:10 2012 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  Index: YAML-AppConfig-0.16/Makefile.PL
     1.5 ---- YAML-AppConfig-0.16/Makefile.PL.orig	2006-07-02 23:21:51 +0200
     1.6 -+++ YAML-AppConfig-0.16/Makefile.PL	2009-11-27 13:24:07 +0100
     1.7 +--- YAML-AppConfig-0.16/Makefile.PL.orig	2006-07-02 23:21:51.000000000 +0200
     1.8 ++++ YAML-AppConfig-0.16/Makefile.PL	2012-07-31 16:07:20.000000000 +0200
     1.9  @@ -21,6 +21,7 @@
    1.10           eval "require $info->[0]; 0;";
    1.11           push @yamls, @$info unless $@;
    1.12 @@ -11,9 +11,9 @@
    1.13   }
    1.14  +
    1.15  Index: syck-0.70/lib/bytecode.c
    1.16 ---- syck-0.70/lib/bytecode.c.orig	2009-09-30 19:29:34 +0200
    1.17 -+++ syck-0.70/lib/bytecode.c	2009-11-27 13:24:07 +0100
    1.18 -@@ -7,6 +7,10 @@
    1.19 +--- syck-0.70/lib/bytecode.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.20 ++++ syck-0.70/lib/bytecode.c	2012-07-31 16:10:17.000000000 +0200
    1.21 +@@ -7,11 +7,16 @@
    1.22    *
    1.23    * Copyright (C) 2003 why the lucky stiff
    1.24    */
    1.25 @@ -24,9 +24,36 @@
    1.26   #include "syck.h"
    1.27   
    1.28   #if GRAM_FILES_HAVE_TAB_SUFFIX
    1.29 + #include "gram.tab.h"
    1.30 + #else
    1.31 ++#define YYPARSE_PARAM
    1.32 + #include "gram.h"
    1.33 + #endif
    1.34 + 
    1.35 +Index: syck-0.70/lib/gram.y
    1.36 +--- syck-0.70/lib/gram.y.orig	2009-09-30 19:29:34.000000000 +0200
    1.37 ++++ syck-0.70/lib/gram.y	2012-07-31 16:09:51.000000000 +0200
    1.38 +@@ -19,14 +19,14 @@
    1.39 + #define YYSTACK_USE_ALLOCA 0
    1.40 + #endif
    1.41 + 
    1.42 ++#define YYPARSE_PARAM   parser
    1.43 ++#define YYLEX_PARAM     parser
    1.44 ++
    1.45 + #include "syck.h"
    1.46 + #include "sycklex.h"
    1.47 + 
    1.48 + void apply_seq_in_map( SyckParser *parser, SyckNode *n );
    1.49 + 
    1.50 +-#define YYPARSE_PARAM   parser
    1.51 +-#define YYLEX_PARAM     parser
    1.52 +-
    1.53 + #define NULL_NODE(parser, node) \
    1.54 +         SyckNode *node = syck_new_str( "", scalar_plain ); \
    1.55 +         if ( ((SyckParser *)parser)->taguri_expansion == 1 ) \
    1.56  Index: syck-0.70/lib/handler.c
    1.57 ---- syck-0.70/lib/handler.c.orig	2009-09-30 19:29:34 +0200
    1.58 -+++ syck-0.70/lib/handler.c	2009-11-27 13:24:07 +0100
    1.59 +--- syck-0.70/lib/handler.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.60 ++++ syck-0.70/lib/handler.c	2012-07-31 16:07:20.000000000 +0200
    1.61  @@ -7,6 +7,9 @@
    1.62    * Copyright (C) 2003 why the lucky stiff
    1.63    */
    1.64 @@ -38,8 +65,8 @@
    1.65   
    1.66   SYMID 
    1.67  Index: syck-0.70/lib/implicit.c
    1.68 ---- syck-0.70/lib/implicit.c.orig	2009-09-30 19:29:34 +0200
    1.69 -+++ syck-0.70/lib/implicit.c	2009-11-27 13:24:07 +0100
    1.70 +--- syck-0.70/lib/implicit.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.71 ++++ syck-0.70/lib/implicit.c	2012-07-31 16:07:20.000000000 +0200
    1.72  @@ -8,6 +8,7 @@
    1.73    * Copyright (C) 2003 why the lucky stiff
    1.74    */
    1.75 @@ -49,8 +76,8 @@
    1.76   
    1.77   #define YYCTYPE     char
    1.78  Index: syck-0.70/lib/node.c
    1.79 ---- syck-0.70/lib/node.c.orig	2009-09-30 19:29:34 +0200
    1.80 -+++ syck-0.70/lib/node.c	2009-11-27 13:24:07 +0100
    1.81 +--- syck-0.70/lib/node.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.82 ++++ syck-0.70/lib/node.c	2012-07-31 16:07:20.000000000 +0200
    1.83  @@ -7,6 +7,9 @@
    1.84    * Copyright (C) 2003 why the lucky stiff
    1.85    */
    1.86 @@ -62,8 +89,8 @@
    1.87   
    1.88   /*
    1.89  Index: syck-0.70/lib/syck.c
    1.90 ---- syck-0.70/lib/syck.c.orig	2009-09-30 19:29:34 +0200
    1.91 -+++ syck-0.70/lib/syck.c	2009-11-27 13:24:07 +0100
    1.92 +--- syck-0.70/lib/syck.c.orig	2009-09-30 19:29:34.000000000 +0200
    1.93 ++++ syck-0.70/lib/syck.c	2012-07-31 16:07:20.000000000 +0200
    1.94  @@ -7,6 +7,7 @@
    1.95    * Copyright (C) 2003 why the lucky stiff
    1.96    */
    1.97 @@ -89,8 +116,8 @@
    1.98           {
    1.99               str->ptr = str->end;
   1.100  Index: syck-0.70/lib/syck.h
   1.101 ---- syck-0.70/lib/syck.h.orig	2009-09-30 19:29:34 +0200
   1.102 -+++ syck-0.70/lib/syck.h	2009-11-27 13:24:07 +0100
   1.103 +--- syck-0.70/lib/syck.h.orig	2009-09-30 19:29:34.000000000 +0200
   1.104 ++++ syck-0.70/lib/syck.h	2012-07-31 16:07:20.000000000 +0200
   1.105  @@ -36,6 +36,8 @@
   1.106   
   1.107   #include <stddef.h>
   1.108 @@ -101,9 +128,9 @@
   1.109   #ifdef HAVE_ST_H
   1.110   #include <st.h>
   1.111  Index: syck-0.70/lib/token.c
   1.112 ---- syck-0.70/lib/token.c.orig	2009-09-30 19:29:34 +0200
   1.113 -+++ syck-0.70/lib/token.c	2009-11-27 13:24:07 +0100
   1.114 -@@ -7,6 +7,8 @@
   1.115 +--- syck-0.70/lib/token.c.orig	2009-09-30 19:29:34.000000000 +0200
   1.116 ++++ syck-0.70/lib/token.c	2012-07-31 16:10:37.000000000 +0200
   1.117 +@@ -7,11 +7,14 @@
   1.118    *
   1.119    * Copyright (C) 2003 why the lucky stiff
   1.120    */
   1.121 @@ -112,9 +139,15 @@
   1.122   #include "syck.h"
   1.123   
   1.124   #if GRAM_FILES_HAVE_TAB_SUFFIX
   1.125 + #include "gram.tab.h"
   1.126 + #else
   1.127 ++#define YYPARSE_PARAM
   1.128 + #include "gram.h"
   1.129 + #endif
   1.130 + 
   1.131  Index: syck-0.70/lib/yaml2byte.c
   1.132 ---- syck-0.70/lib/yaml2byte.c.orig	2009-09-30 19:29:34 +0200
   1.133 -+++ syck-0.70/lib/yaml2byte.c	2009-11-27 13:24:31 +0100
   1.134 +--- syck-0.70/lib/yaml2byte.c.orig	2009-09-30 19:29:34.000000000 +0200
   1.135 ++++ syck-0.70/lib/yaml2byte.c	2012-07-31 16:07:20.000000000 +0200
   1.136  @@ -11,6 +11,8 @@
   1.137    */ 
   1.138   #include "syck.h"

     2.1 --- a/yaml/yaml.spec	Wed Feb 08 20:14:10 2012 +0200
     2.2 +++ b/yaml/yaml.spec	Tue Aug 28 18:50:10 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  yaml.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -24,9 +24,9 @@
    2.12  #   package version
    2.13  %define       V_libsyck             0.70
    2.14  %define       V_libyaml             0.1.4
    2.15 -%define       V_perl_yaml           0.80
    2.16 -%define       V_perl_yaml_syck      1.19
    2.17 -%define       V_perl_yaml_tiny      1.50
    2.18 +%define       V_perl_yaml           0.84
    2.19 +%define       V_perl_yaml_syck      1.20
    2.20 +%define       V_perl_yaml_tiny      1.51
    2.21  %define       V_perl_yaml_appconfig 0.16
    2.22  %define       V_perl_yaml_libyaml   0.38
    2.23  %define       V_perl_yaml_active    1.100810
    2.24 @@ -37,7 +37,8 @@
    2.25  %define       V_java_jvyaml         0.2.1
    2.26  %define       V_java_jyaml          1.3
    2.27  %define       V_php_syck            0.9.3
    2.28 -%define       V_php_yaml            1.0.1
    2.29 +%define       V_php_yaml            1.1.0RC2
    2.30 +%define       V_php_spyc            0.4.5
    2.31  
    2.32  #   package information
    2.33  Name:         yaml
    2.34 @@ -50,7 +51,7 @@
    2.35  Group:        Language
    2.36  License:      BSD/Artistic
    2.37  Version:      0
    2.38 -Release:      20120208
    2.39 +Release:      20120731
    2.40  
    2.41  #   package options
    2.42  %option       with_perl   no
    2.43 @@ -74,15 +75,14 @@
    2.44  Source12:     http://www.cpan.org/authors/id/E/EI/EIDOLON/YAML-Object-%{V_perl_yaml_object}.tar.gz
    2.45  Source13:     http://pecl.php.net/get/syck-%{V_php_syck}.tgz
    2.46  Source14:     http://pecl.php.net/get/yaml-%{V_php_yaml}.tgz
    2.47 -Source15:     http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
    2.48 -Source16:     yaml.yml
    2.49 +Source15:     http://spyc.googlecode.com/files/spyc-%{V_php_spyc}.zip
    2.50 +Source16:     http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
    2.51 +Source17:     yaml.yml
    2.52  Patch0:       yaml.patch
    2.53  
    2.54  #   build information
    2.55 -Prefix:       %{l_prefix}
    2.56 -BuildRoot:    %{l_buildroot}
    2.57 -BuildPreReq:  OpenPKG, openpkg >= 20060823, make, bison
    2.58 -PreReq:       OpenPKG, openpkg >= 20060823
    2.59 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make, bison
    2.60 +PreReq:       OpenPKG, openpkg >= 20100101
    2.61  %if "%{with_perl}" == "yes"
    2.62  BuildPreReq:  perl, perl-openpkg, perl-module
    2.63  PreReq:       perl
    2.64 @@ -99,8 +99,6 @@
    2.65  BuildPreReq:  java, JAVA-JDK, ant
    2.66  PreReq:       java, JAVA-JDK
    2.67  %endif
    2.68 -AutoReq:      no
    2.69 -AutoReqProv:  no
    2.70  
    2.71  %description
    2.72      YAML Ain't Markup Language (YAML) is an international collaboration
    2.73 @@ -193,6 +191,11 @@
    2.74          url       = http://pecl.php.net/package/yaml
    2.75          regex     = yaml-(__VER__)\.tgz
    2.76      }
    2.77 +    prog yaml:PHP-spyc = {
    2.78 +        version   = %{V_php_spyc}
    2.79 +        url       = http://spyc.googlecode.com/files/
    2.80 +        regex     = spyc-(__VER__)\.zip
    2.81 +    }
    2.82  
    2.83  %prep
    2.84      %setup -q -c
    2.85 @@ -210,6 +213,7 @@
    2.86      %setup -q -T -D -a 12
    2.87      %setup -q -T -D -a 13
    2.88      %setup -q -T -D -a 14
    2.89 +    %setup -q -T -D -a 15
    2.90      %patch -p0
    2.91  
    2.92  %build
    2.93 @@ -228,8 +232,7 @@
    2.94        CC="%{l_cc}" \
    2.95        CFLAGS="%{l_cflags -O}" \
    2.96        ./configure \
    2.97 -          --prefix=%{l_prefix} \
    2.98 -          --disable-shared
    2.99 +          --prefix=%{l_prefix}
   2.100        %{l_make} %{l_mflags}
   2.101      ) || exit $?
   2.102  
   2.103 @@ -289,8 +292,6 @@
   2.104  %endif
   2.105  
   2.106  %install
   2.107 -    #   clean build cruft
   2.108 -    rm -rf $RPM_BUILD_ROOT
   2.109  
   2.110      #   install YAML C API
   2.111      ( cd yaml-%{V_libyaml}
   2.112 @@ -310,6 +311,12 @@
   2.113      ( cd yaml-%{V_php_yaml}
   2.114        %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
   2.115      ) || exit $?
   2.116 +    ( cd spyc-%{V_php_spyc}
   2.117 +      %{l_shtool} mkdir -f -p -m 755 \
   2.118 +          $RPM_BUILD_ROOT%{l_prefix}/share/yaml
   2.119 +      %{l_shtool} install -c -m 644 \
   2.120 +          spyc.php $RPM_BUILD_ROOT%{l_prefix}/share/yaml/
   2.121 +    ) || exit $?
   2.122  %endif
   2.123  
   2.124      #   install Ruby API
   2.125 @@ -368,5 +375,4 @@
   2.126  %files -f files
   2.127  
   2.128  %clean
   2.129 -    rm -rf $RPM_BUILD_ROOT
   2.130