Преглед на файлове

remove YAML parts as they are now part of the dedicated 'yaml' package

Ralf S. Engelschall преди 19 години
родител
ревизия
a3ac07e667
променени са 1 файла, в които са добавени 9 реда и са изтрити 29 реда
  1. 9 29
      perl-parse/perl-parse.spec

+ 9 - 29
perl-parse/perl-parse.spec

@@ -41,8 +41,6 @@
 %define       V_appconfig                 1.63
 %define       V_appconfig_std             1.07
 %define       V_template                  2.15
-%define       V_yaml                      0.62
-%define       V_yaml_syck                 0.72
 %define       V_ogdl                      20041124
 %define       V_text_csv_pp               1.01
 %define       V_text_csv_xs               0.23
@@ -76,15 +74,13 @@ Source10:     http://www.cpan.org/modules/by-module/C/C-Scan-%{V_c_scan}.tar.gz
 Source11:     http://www.cpan.org/modules/by-module/AppConfig/AppConfig-%{V_appconfig}.tar.gz
 Source12:     http://www.cpan.org/modules/by-module/AppConfig/AppConfig-Std-%{V_appconfig_std}.tar.gz
 Source13:     http://www.cpan.org/modules/by-module/Template/Template-Toolkit-%{V_template}.tar.gz
-Source14:     http://www.cpan.org/modules/by-module/YAML/YAML-%{V_yaml}.tar.gz
-Source15:     http://www.cpan.org/modules/by-module/YAML/YAML-Syck-%{V_yaml_syck}.tar.gz
-Source16:     http://switch.dl.sourceforge.net/ogdl/ogdlutils-%{V_ogdl}.tgz
-Source17:     http://www.cpan.org/modules/by-module/String/String-Tokenizer-%{V_string_tokenizer}.tar.gz
-Source18:     http://www.cpan.org/modules/by-module/Config/Config-Context-%{V_config_context}.tar.gz
-Source19:     http://www.cpan.org/modules/by-module/Config/Config-Scoped-%{V_config_scoped}.tar.gz
-Source20:     http://www.cpan.org/modules/by-module/Text/Text-CSV_PP-%{V_text_csv_pp}.tar.gz
-Source21:     http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-%{V_text_csv_xs}.tar.gz
-Source22:     http://www.cpan.org/modules/by-module/Text/Text-CSV-Simple-%{V_text_csv_simple}.tar.gz
+Source14:     http://switch.dl.sourceforge.net/ogdl/ogdlutils-%{V_ogdl}.tgz
+Source15:     http://www.cpan.org/modules/by-module/String/String-Tokenizer-%{V_string_tokenizer}.tar.gz
+Source16:     http://www.cpan.org/modules/by-module/Config/Config-Context-%{V_config_context}.tar.gz
+Source17:     http://www.cpan.org/modules/by-module/Config/Config-Scoped-%{V_config_scoped}.tar.gz
+Source18:     http://www.cpan.org/modules/by-module/Text/Text-CSV_PP-%{V_text_csv_pp}.tar.gz
+Source19:     http://www.cpan.org/modules/by-module/Text/Text-CSV_XS-%{V_text_csv_xs}.tar.gz
+Source20:     http://www.cpan.org/modules/by-module/Text/Text-CSV-Simple-%{V_text_csv_simple}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -115,8 +111,6 @@ AutoReqProv:  no
     - AppConfig (%{V_appconfig})
     - AppConfig::Std (%{V_appconfig_std})
     - Template (%{V_template})
-    - YAML (%{V_yaml})
-    - YAML::Syck (%{V_yaml_syck})
     - OGDL (%{V_ogdl})
     - Text::CSV_PP (%{V_text_csv_pp})
     - Text::CSV_XS (%{V_text_csv_xs})
@@ -193,16 +187,6 @@ AutoReqProv:  no
         url       = http://www.cpan.org/modules/by-module/Template/
         regex     = Template-Toolkit-(__VER__)\.tar\.gz
     }
-    prog perl-parse:YAML = {
-        version   = %{V_yaml}
-        url       = http://www.cpan.org/modules/by-module/YAML/
-        regex     = YAML-(__VER__)\.tar\.gz
-    }
-    prog perl-parse:YAML-Syck = {
-        version   = %{V_yaml_syck}
-        url       = http://www.cpan.org/modules/by-module/YAML/
-        regex     = YAML-Syck-(__VER__)\.tar\.gz
-    }
     prog perl-parse:OGDL = {
         version   = %{V_ogdl}
         url       = http://prdownloads.sourceforge.net/ogdl/
@@ -261,8 +245,6 @@ AutoReqProv:  no
     %setup -q -T -D -a 18
     %setup -q -T -D -a 19
     %setup -q -T -D -a 20
-    %setup -q -T -D -a 21
-    %setup -q -T -D -a 22
 
 %build
 
@@ -286,19 +268,17 @@ AutoReqProv:  no
         -A TT_XS_ENABLE=y -A TT_XS_DEFAULT=y -A TT_DBI=n \
         -A TT_QUIET=n -A TT_ACCEPT=y \
         configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE14} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE15} configure build install
     ( cd ogdlutils-%{V_ogdl}/c
       %{l_cc} %{l_cflags} -c ogdlparser.c graph.c path.c ogdllog.c
       ar cr libogdl.a ogdlparser.o graph.o path.o ogdllog.o
     ) || exit $?
     %{l_prefix}/bin/perl-openpkg -d ogdlutils-%{V_ogdl}/perl configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE15} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE16} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE17} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE18} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE19} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE20} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE21} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE22} configure build install
     %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat perl-openpkg-files`