diff -r 488716b6db75 -r f65313225f8a yaml/yaml.spec
--- a/yaml/yaml.spec Wed Feb 08 20:14:10 2012 +0200
+++ b/yaml/yaml.spec Tue Aug 28 18:50:10 2012 +0200
@@ -1,6 +1,6 @@
##
## yaml.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2011 OpenPKG Foundation e.V.
+## Copyright (c) 2000-2012 OpenPKG Foundation e.V.
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -24,9 +24,9 @@
# package version
%define V_libsyck 0.70
%define V_libyaml 0.1.4
-%define V_perl_yaml 0.80
-%define V_perl_yaml_syck 1.19
-%define V_perl_yaml_tiny 1.50
+%define V_perl_yaml 0.84
+%define V_perl_yaml_syck 1.20
+%define V_perl_yaml_tiny 1.51
%define V_perl_yaml_appconfig 0.16
%define V_perl_yaml_libyaml 0.38
%define V_perl_yaml_active 1.100810
@@ -37,7 +37,8 @@
%define V_java_jvyaml 0.2.1
%define V_java_jyaml 1.3
%define V_php_syck 0.9.3
-%define V_php_yaml 1.0.1
+%define V_php_yaml 1.1.0RC2
+%define V_php_spyc 0.4.5
# package information
Name: yaml
@@ -50,7 +51,7 @@
Group: Language
License: BSD/Artistic
Version: 0
-Release: 20120208
+Release: 20120731
# package options
%option with_perl no
@@ -74,15 +75,14 @@
Source12: http://www.cpan.org/authors/id/E/EI/EIDOLON/YAML-Object-%{V_perl_yaml_object}.tar.gz
Source13: http://pecl.php.net/get/syck-%{V_php_syck}.tgz
Source14: http://pecl.php.net/get/yaml-%{V_php_yaml}.tgz
-Source15: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
-Source16: yaml.yml
+Source15: http://spyc.googlecode.com/files/spyc-%{V_php_spyc}.zip
+Source16: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
+Source17: yaml.yml
Patch0: yaml.patch
# build information
-Prefix: %{l_prefix}
-BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison
-PreReq: OpenPKG, openpkg >= 20060823
+BuildPreReq: OpenPKG, openpkg >= 20100101, make, bison
+PreReq: OpenPKG, openpkg >= 20100101
%if "%{with_perl}" == "yes"
BuildPreReq: perl, perl-openpkg, perl-module
PreReq: perl
@@ -99,8 +99,6 @@
BuildPreReq: java, JAVA-JDK, ant
PreReq: java, JAVA-JDK
%endif
-AutoReq: no
-AutoReqProv: no
%description
YAML Ain't Markup Language (YAML) is an international collaboration
@@ -193,6 +191,11 @@
url = http://pecl.php.net/package/yaml
regex = yaml-(__VER__)\.tgz
}
+ prog yaml:PHP-spyc = {
+ version = %{V_php_spyc}
+ url = http://spyc.googlecode.com/files/
+ regex = spyc-(__VER__)\.zip
+ }
%prep
%setup -q -c
@@ -210,6 +213,7 @@
%setup -q -T -D -a 12
%setup -q -T -D -a 13
%setup -q -T -D -a 14
+ %setup -q -T -D -a 15
%patch -p0
%build
@@ -228,8 +232,7 @@
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
- --prefix=%{l_prefix} \
- --disable-shared
+ --prefix=%{l_prefix}
%{l_make} %{l_mflags}
) || exit $?
@@ -289,8 +292,6 @@
%endif
%install
- # clean build cruft
- rm -rf $RPM_BUILD_ROOT
# install YAML C API
( cd yaml-%{V_libyaml}
@@ -310,6 +311,12 @@
( cd yaml-%{V_php_yaml}
%{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
) || exit $?
+ ( cd spyc-%{V_php_spyc}
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/share/yaml
+ %{l_shtool} install -c -m 644 \
+ spyc.php $RPM_BUILD_ROOT%{l_prefix}/share/yaml/
+ ) || exit $?
%endif
# install Ruby API
@@ -368,5 +375,4 @@
%files -f files
%clean
- rm -rf $RPM_BUILD_ROOT