1.1 --- a/yaml/yaml.spec Wed Feb 08 20:14:10 2012 +0200 1.2 +++ b/yaml/yaml.spec Tue Aug 28 18:50:10 2012 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 ## 1.5 ## yaml.spec -- OpenPKG RPM Package Specification 1.6 -## Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/> 1.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 1.8 ## 1.9 ## Permission to use, copy, modify, and distribute this software for 1.10 ## any purpose with or without fee is hereby granted, provided that 1.11 @@ -24,9 +24,9 @@ 1.12 # package version 1.13 %define V_libsyck 0.70 1.14 %define V_libyaml 0.1.4 1.15 -%define V_perl_yaml 0.80 1.16 -%define V_perl_yaml_syck 1.19 1.17 -%define V_perl_yaml_tiny 1.50 1.18 +%define V_perl_yaml 0.84 1.19 +%define V_perl_yaml_syck 1.20 1.20 +%define V_perl_yaml_tiny 1.51 1.21 %define V_perl_yaml_appconfig 0.16 1.22 %define V_perl_yaml_libyaml 0.38 1.23 %define V_perl_yaml_active 1.100810 1.24 @@ -37,7 +37,8 @@ 1.25 %define V_java_jvyaml 0.2.1 1.26 %define V_java_jyaml 1.3 1.27 %define V_php_syck 0.9.3 1.28 -%define V_php_yaml 1.0.1 1.29 +%define V_php_yaml 1.1.0RC2 1.30 +%define V_php_spyc 0.4.5 1.31 1.32 # package information 1.33 Name: yaml 1.34 @@ -50,7 +51,7 @@ 1.35 Group: Language 1.36 License: BSD/Artistic 1.37 Version: 0 1.38 -Release: 20120208 1.39 +Release: 20120731 1.40 1.41 # package options 1.42 %option with_perl no 1.43 @@ -74,15 +75,14 @@ 1.44 Source12: http://www.cpan.org/authors/id/E/EI/EIDOLON/YAML-Object-%{V_perl_yaml_object}.tar.gz 1.45 Source13: http://pecl.php.net/get/syck-%{V_php_syck}.tgz 1.46 Source14: http://pecl.php.net/get/yaml-%{V_php_yaml}.tgz 1.47 -Source15: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf 1.48 -Source16: yaml.yml 1.49 +Source15: http://spyc.googlecode.com/files/spyc-%{V_php_spyc}.zip 1.50 +Source16: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf 1.51 +Source17: yaml.yml 1.52 Patch0: yaml.patch 1.53 1.54 # build information 1.55 -Prefix: %{l_prefix} 1.56 -BuildRoot: %{l_buildroot} 1.57 -BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison 1.58 -PreReq: OpenPKG, openpkg >= 20060823 1.59 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, bison 1.60 +PreReq: OpenPKG, openpkg >= 20100101 1.61 %if "%{with_perl}" == "yes" 1.62 BuildPreReq: perl, perl-openpkg, perl-module 1.63 PreReq: perl 1.64 @@ -99,8 +99,6 @@ 1.65 BuildPreReq: java, JAVA-JDK, ant 1.66 PreReq: java, JAVA-JDK 1.67 %endif 1.68 -AutoReq: no 1.69 -AutoReqProv: no 1.70 1.71 %description 1.72 YAML Ain't Markup Language (YAML) is an international collaboration 1.73 @@ -193,6 +191,11 @@ 1.74 url = http://pecl.php.net/package/yaml 1.75 regex = yaml-(__VER__)\.tgz 1.76 } 1.77 + prog yaml:PHP-spyc = { 1.78 + version = %{V_php_spyc} 1.79 + url = http://spyc.googlecode.com/files/ 1.80 + regex = spyc-(__VER__)\.zip 1.81 + } 1.82 1.83 %prep 1.84 %setup -q -c 1.85 @@ -210,6 +213,7 @@ 1.86 %setup -q -T -D -a 12 1.87 %setup -q -T -D -a 13 1.88 %setup -q -T -D -a 14 1.89 + %setup -q -T -D -a 15 1.90 %patch -p0 1.91 1.92 %build 1.93 @@ -228,8 +232,7 @@ 1.94 CC="%{l_cc}" \ 1.95 CFLAGS="%{l_cflags -O}" \ 1.96 ./configure \ 1.97 - --prefix=%{l_prefix} \ 1.98 - --disable-shared 1.99 + --prefix=%{l_prefix} 1.100 %{l_make} %{l_mflags} 1.101 ) || exit $? 1.102 1.103 @@ -289,8 +292,6 @@ 1.104 %endif 1.105 1.106 %install 1.107 - # clean build cruft 1.108 - rm -rf $RPM_BUILD_ROOT 1.109 1.110 # install YAML C API 1.111 ( cd yaml-%{V_libyaml} 1.112 @@ -310,6 +311,12 @@ 1.113 ( cd yaml-%{V_php_yaml} 1.114 %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT 1.115 ) || exit $? 1.116 + ( cd spyc-%{V_php_spyc} 1.117 + %{l_shtool} mkdir -f -p -m 755 \ 1.118 + $RPM_BUILD_ROOT%{l_prefix}/share/yaml 1.119 + %{l_shtool} install -c -m 644 \ 1.120 + spyc.php $RPM_BUILD_ROOT%{l_prefix}/share/yaml/ 1.121 + ) || exit $? 1.122 %endif 1.123 1.124 # install Ruby API 1.125 @@ -368,5 +375,4 @@ 1.126 %files -f files 1.127 1.128 %clean 1.129 - rm -rf $RPM_BUILD_ROOT 1.130