# HG changeset patch # User Michael Schloh von Bennewitz # Date 1316099475 -7200 # Node ID cce1eb91ccfc74da1fc88e6b25398e0d6ef692ce # Parent 14df3eec63f9c143c1d29314f2d887a5af91f497 Remove zip distributed file as unnecessary, and backport RPM boilerplate logic. diff -r 14df3eec63f9 -r cce1eb91ccfc yaml/yaml.spec --- a/yaml/yaml.spec Thu Sep 15 17:10:15 2011 +0200 +++ b/yaml/yaml.spec Thu Sep 15 17:11:15 2011 +0200 @@ -38,7 +38,6 @@ %define V_java_jyaml 1.3 %define V_php_syck 0.9.3 %define V_php_yaml 1.0.1 -%define V_php_spyc 0.4.5 # package information Name: yaml @@ -51,7 +50,7 @@ Group: Language License: BSD/Artistic Version: 0 -Release: 20110624 +Release: 20110914 # package options %option with_perl no @@ -75,14 +74,15 @@ 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://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 +Source15: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf +Source16: yaml.yml Patch0: yaml.patch # build information -BuildPreReq: OpenPKG, openpkg >= 20100101, make, bison -PreReq: OpenPKG, openpkg >= 20100101 +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison +PreReq: OpenPKG, openpkg >= 20060823 %if "%{with_perl}" == "yes" BuildPreReq: perl, perl-openpkg, perl-module PreReq: perl @@ -99,6 +99,8 @@ 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 @@ -191,11 +193,6 @@ 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 @@ -213,7 +210,6 @@ %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 @@ -293,6 +289,7 @@ %endif %install + rm -rf $RPM_BUILD_ROOT # install YAML C API ( cd yaml-%{V_libyaml} @@ -312,12 +309,6 @@ ( 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 @@ -376,4 +367,5 @@ %files -f files %clean + rm -rf $RPM_BUILD_ROOT