Переглянути джерело

kick out obsolete module and update other PHP related one

Ralf S. Engelschall 8 роки тому
батько
коміт
11f1775786
1 змінених файлів з 6 додано та 27 видалено
  1. 6 27
      yaml/yaml.spec

+ 6 - 27
yaml/yaml.spec

@@ -36,8 +36,7 @@
 %define       V_yaml_spec           2004-12-28
 %define       V_java_jvyaml         0.2.1
 %define       V_java_jyaml          1.3
-%define       V_php_syck            0.9.3
-%define       V_php_yaml            2.0.0RC7
+%define       V_php_yaml            2.0.2
 %define       V_php_spyc            0.4.5
 
 #   package information
@@ -51,7 +50,7 @@ Class:        PLUS
 Group:        Language
 License:      BSD/Artistic
 Version:      0
-Release:      20170519
+Release:      20170730
 
 #   package options
 %option       with_perl   no
@@ -73,11 +72,10 @@ Source9:      http://osdn.dl.sourceforge.net/yaml-javascript/yaml-javascript-%{V
 Source10:     https://jvyaml.dev.java.net/files/documents/5215/41455/jvyaml-src-%{V_java_jvyaml}.tar.gz
 Source11:     http://download.sourceforge.net/jyaml/jyaml-src-%{V_java_jyaml}.tgz
 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
+Source13:     http://pecl.php.net/get/yaml-%{V_php_yaml}.tgz
+Source14:     http://spyc.googlecode.com/files/spyc-%{V_php_spyc}.zip
+Source15:     http://yaml.org/spec/history/%{V_yaml_spec}/%{V_yaml_spec}.pdf
+Source16:     yaml.yml
 Patch0:       yaml.patch
 
 #   build information
@@ -181,11 +179,6 @@ PreReq:       java, JAVA-JDK
         url       = http://www.cpan.org/authors/id/E/EI/EIDOLON/
         regex     = YAML-Object-(__VER__)\.tar\.gz
     }
-    prog yaml:PHP-Syck = {
-        version   = %{V_php_syck}
-        url       = http://pecl.php.net/package/syck
-        regex     = syck-(__VER__)\.tgz
-    }
     prog yaml:PHP-YAML = {
         version   = %{V_php_yaml}
         url       = http://pecl.php.net/package/yaml
@@ -213,7 +206,6 @@ PreReq:       java, JAVA-JDK
     %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
@@ -238,16 +230,6 @@ PreReq:       java, JAVA-JDK
 
     #   build PHP API
 %if "%{with_php}" == "yes"
-    ( cd syck-%{V_php_syck}
-      %{l_prefix}/bin/phpize
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="-I`pwd`/../syck-%{V_libsyck}/lib" \
-      LDFLAGS="-L`pwd`/../syck-%{V_libsyck}/lib" \
-      ./configure \
-          --with-syck=`pwd`/../syck-%{V_libsyck}
-      %{l_make} %{l_mflags}
-    ) || exit $?
     ( cd yaml-%{V_php_yaml}
       %{l_prefix}/bin/phpize
       CC="%{l_cc}" \
@@ -305,9 +287,6 @@ PreReq:       java, JAVA-JDK
 
     #   install PHP API
 %if "%{with_php}" == "yes"
-    ( cd syck-%{V_php_syck}
-      %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
-    ) || exit $?
     ( cd yaml-%{V_php_yaml}
       %{l_make} %{l_mflags} install INSTALL_ROOT=$RPM_BUILD_ROOT
     ) || exit $?