Thu, 15 Sep 2011 17:11:15 +0200
Remove zip distributed file as unnecessary, and backport RPM boilerplate logic.
yaml/yaml.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/yaml/yaml.spec Thu Sep 15 17:10:15 2011 +0200 1.2 +++ b/yaml/yaml.spec Thu Sep 15 17:11:15 2011 +0200 1.3 @@ -38,7 +38,6 @@ 1.4 %define V_java_jyaml 1.3 1.5 %define V_php_syck 0.9.3 1.6 %define V_php_yaml 1.0.1 1.7 -%define V_php_spyc 0.4.5 1.8 1.9 # package information 1.10 Name: yaml 1.11 @@ -51,7 +50,7 @@ 1.12 Group: Language 1.13 License: BSD/Artistic 1.14 Version: 0 1.15 -Release: 20110624 1.16 +Release: 20110914 1.17 1.18 # package options 1.19 %option with_perl no 1.20 @@ -75,14 +74,15 @@ 1.21 Source12: http://www.cpan.org/authors/id/E/EI/EIDOLON/YAML-Object-%{V_perl_yaml_object}.tar.gz 1.22 Source13: http://pecl.php.net/get/syck-%{V_php_syck}.tgz 1.23 Source14: http://pecl.php.net/get/yaml-%{V_php_yaml}.tgz 1.24 -Source15: http://spyc.googlecode.com/files/spyc-%{V_php_spyc}.zip 1.25 -Source16: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf 1.26 -Source17: yaml.yml 1.27 +Source15: http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf 1.28 +Source16: yaml.yml 1.29 Patch0: yaml.patch 1.30 1.31 # build information 1.32 -BuildPreReq: OpenPKG, openpkg >= 20100101, make, bison 1.33 -PreReq: OpenPKG, openpkg >= 20100101 1.34 +Prefix: %{l_prefix} 1.35 +BuildRoot: %{l_buildroot} 1.36 +BuildPreReq: OpenPKG, openpkg >= 20060823, make, bison 1.37 +PreReq: OpenPKG, openpkg >= 20060823 1.38 %if "%{with_perl}" == "yes" 1.39 BuildPreReq: perl, perl-openpkg, perl-module 1.40 PreReq: perl 1.41 @@ -99,6 +99,8 @@ 1.42 BuildPreReq: java, JAVA-JDK, ant 1.43 PreReq: java, JAVA-JDK 1.44 %endif 1.45 +AutoReq: no 1.46 +AutoReqProv: no 1.47 1.48 %description 1.49 YAML Ain't Markup Language (YAML) is an international collaboration 1.50 @@ -191,11 +193,6 @@ 1.51 url = http://pecl.php.net/package/yaml 1.52 regex = yaml-(__VER__)\.tgz 1.53 } 1.54 - prog yaml:PHP-spyc = { 1.55 - version = %{V_php_spyc} 1.56 - url = http://spyc.googlecode.com/files/ 1.57 - regex = spyc-(__VER__)\.zip 1.58 - } 1.59 1.60 %prep 1.61 %setup -q -c 1.62 @@ -213,7 +210,6 @@ 1.63 %setup -q -T -D -a 12 1.64 %setup -q -T -D -a 13 1.65 %setup -q -T -D -a 14 1.66 - %setup -q -T -D -a 15 1.67 %patch -p0 1.68 1.69 %build 1.70 @@ -293,6 +289,7 @@ 1.71 %endif 1.72 1.73 %install 1.74 + rm -rf $RPM_BUILD_ROOT 1.75 1.76 # install YAML C API 1.77 ( cd yaml-%{V_libyaml} 1.78 @@ -312,12 +309,6 @@ 1.79 ( cd yaml-%{V_php_yaml} 1.80 %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT 1.81 ) || exit $? 1.82 - ( cd spyc-%{V_php_spyc} 1.83 - %{l_shtool} mkdir -f -p -m 755 \ 1.84 - $RPM_BUILD_ROOT%{l_prefix}/share/yaml 1.85 - %{l_shtool} install -c -m 644 \ 1.86 - spyc.php $RPM_BUILD_ROOT%{l_prefix}/share/yaml/ 1.87 - ) || exit $? 1.88 %endif 1.89 1.90 # install Ruby API 1.91 @@ -376,4 +367,5 @@ 1.92 %files -f files 1.93 1.94 %clean 1.95 + rm -rf $RPM_BUILD_ROOT 1.96