Forráskód Böngészése

get rid of WWW::OpenSearch as it has more or more nasty dependencies which break out perl-* layout

Ralf S. Engelschall 18 éve
szülő
commit
9d1b4128fd
1 módosított fájl, 25 hozzáadás és 35 törlés
  1. 25 35
      perl-www/perl-www.spec

+ 25 - 35
perl-www/perl-www.spec

@@ -75,7 +75,6 @@
 %define       V_www_search_yahoo                      2.409
 %define       V_www_search_lycos                      2.221
 %define       V_www_search_alltheweb                  1.5
-%define       V_www_opensearch                        0.11
 %define       V_www_wikipedia                         1.93
 %define       V_http_daemon_ssl                       1.02
 %define       V_http_proxy                            0.20
@@ -100,7 +99,7 @@ Class:        BASE
 Group:        Perl
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20071219
+Release:      20071222
 
 #   package options
 %option       with_curl  no
@@ -149,27 +148,26 @@ Source39:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Daemon-SSL-%{V_htt
 Source40:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Proxy-%{V_http_proxy}.tar.gz
 Source41:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Recorder-%{V_http_recorder}.tar.gz
 Source42:     http://www.cpan.org/modules/by-module/WDDX/WDDX-%{V_wddx}.tar.gz
-Source43:     http://www.cpan.org/modules/by-module/WWW/WWW-OpenSearch-%{V_www_opensearch}.tar.gz
-Source44:     http://www.cpan.org/modules/by-module/WWW/WWW-Wikipedia-%{V_www_wikipedia}.tar.gz
-Source45:     ftp://ftp.dev.ecos.de/pub/perl/embperl/Embperl-%{V_embperl}.tar.gz
-Source46:     http://www.cpan.org/modules/by-module/CGI/CGI-Ajax-%{V_cgi_ajax}.tar.gz
-Source47:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-AutoRunmode-%{V_cgi_application_plugin_autorunmode}.tar.gz
-Source48:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Forward-%{V_cgi_application_plugin_forward}.tar.gz
-Source49:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-AnyTemplate-%{V_cgi_application_plugin_anytemplate}.tar.gz
-Source50:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Config-Context-%{V_cgi_application_plugin_config_context}.tar.gz
-Source51:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-DBH-%{V_cgi_application_plugin_dbh}.tar.gz
-Source52:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Session-%{V_cgi_application_plugin_session}.tar.gz
-Source53:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Stream-%{V_cgi_application_plugin_stream}.tar.gz
-Source54:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Request-Params-%{V_http_request_params}.tar.gz
-Source55:     http://www.cpan.org/modules/by-module/URI/URI-Fetch-%{V_uri_fetch}.tar.gz
-Source56:     http://www.cpan.org/modules/by-module/Net/Net-OpenID-Consumer-%{V_net_openid_consumer}.tar.gz
-Source57:     http://www.cpan.org/modules/by-module/Net/Net-OpenID-Server-%{V_net_openid_server}.tar.gz
-Source58:     http://www.cpan.org/modules/by-module/CGI/CGI-Session-Submitted-%{V_cgi_session_submitted}.tar.gz
-Source59:     http://www.cpan.org/modules/by-module/CGI/CGI-PathRequest-%{V_cgi_pathrequest}.tar.gz
-Source60:     http://www.cpan.org/modules/by-module/WWW/WWW-Curl-%{V_www_curl}.tar.gz
-Source61:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Response-Encoding-%{V_http_response_encoding}.tar.gz
-Source62:     http://www.cpan.org/modules/by-module/WWW/Scraper-%{V_www_scraper}.tar.gz
-Source63:     http://www.cpan.org/modules/by-module/Web/Web-Scraper-%{V_web_scraper}.tar.gz
+Source43:     http://www.cpan.org/modules/by-module/WWW/WWW-Wikipedia-%{V_www_wikipedia}.tar.gz
+Source44:     ftp://ftp.dev.ecos.de/pub/perl/embperl/Embperl-%{V_embperl}.tar.gz
+Source45:     http://www.cpan.org/modules/by-module/CGI/CGI-Ajax-%{V_cgi_ajax}.tar.gz
+Source46:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-AutoRunmode-%{V_cgi_application_plugin_autorunmode}.tar.gz
+Source47:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Forward-%{V_cgi_application_plugin_forward}.tar.gz
+Source48:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-AnyTemplate-%{V_cgi_application_plugin_anytemplate}.tar.gz
+Source49:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Config-Context-%{V_cgi_application_plugin_config_context}.tar.gz
+Source50:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-DBH-%{V_cgi_application_plugin_dbh}.tar.gz
+Source51:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Session-%{V_cgi_application_plugin_session}.tar.gz
+Source52:     http://www.cpan.org/modules/by-module/CGI/CGI-Application-Plugin-Stream-%{V_cgi_application_plugin_stream}.tar.gz
+Source53:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Request-Params-%{V_http_request_params}.tar.gz
+Source54:     http://www.cpan.org/modules/by-module/URI/URI-Fetch-%{V_uri_fetch}.tar.gz
+Source55:     http://www.cpan.org/modules/by-module/Net/Net-OpenID-Consumer-%{V_net_openid_consumer}.tar.gz
+Source56:     http://www.cpan.org/modules/by-module/Net/Net-OpenID-Server-%{V_net_openid_server}.tar.gz
+Source57:     http://www.cpan.org/modules/by-module/CGI/CGI-Session-Submitted-%{V_cgi_session_submitted}.tar.gz
+Source58:     http://www.cpan.org/modules/by-module/CGI/CGI-PathRequest-%{V_cgi_pathrequest}.tar.gz
+Source59:     http://www.cpan.org/modules/by-module/WWW/WWW-Curl-%{V_www_curl}.tar.gz
+Source60:     http://www.cpan.org/modules/by-module/HTTP/HTTP-Response-Encoding-%{V_http_response_encoding}.tar.gz
+Source61:     http://www.cpan.org/modules/by-module/WWW/Scraper-%{V_www_scraper}.tar.gz
+Source62:     http://www.cpan.org/modules/by-module/Web/Web-Scraper-%{V_web_scraper}.tar.gz
 Patch0:       perl-www.patch
 
 #   build information
@@ -233,7 +231,6 @@ AutoReqProv:  no
     - WWW::Search::Yahoo (%{V_www_search_yahoo})
     - WWW::Search::Lycos (%{V_www_search_lycos})
     - WWW::Search::AlltheWeb (%{V_www_search_alltheweb})
-    - WWW::OpenSearch (%{V_www_opensearch})
     - WWW::Wikipedia (%{V_www_wikipedia})
     - HTTP::Daemon::SSL (%{V_http_daemon_ssl})
     - HTTP::Proxy (%{V_http_proxy})
@@ -535,11 +532,6 @@ AutoReqProv:  no
         url       = http://www.cpan.org/modules/by-module/WDDX/
         regex     = WDDX-(__VER__)\.tar\.gz
     }
-    prog perl-www:WWW-OpenSearch = {
-        version   = %{V_www_opensearch}
-        url       = http://www.cpan.org/modules/by-module/WWW/
-        regex     = WWW-OpenSearch-(__VER__)\.tar\.gz
-    }
     prog perl-www:WWW-Wikipedia = {
         version   = %{V_www_wikipedia}
         url       = http://www.cpan.org/modules/by-module/WWW/
@@ -635,13 +627,12 @@ AutoReqProv:  no
     %setup -q -T -D -a 56
     %setup -q -T -D -a 57
     %setup -q -T -D -a 58
-    %setup -q -T -D -a 59
 %if "%{with_curl}" == "yes"
-    %setup -q -T -D -a 60
+    %setup -q -T -D -a 59
 %endif
+    %setup -q -T -D -a 60
     %setup -q -T -D -a 61
     %setup -q -T -D -a 62
-    %setup -q -T -D -a 63
     %patch -p0
 
 %build
@@ -708,13 +699,12 @@ AutoReqProv:  no
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE56} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE57} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE58} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE59} configure build install
 %if "%{with_curl}" == "yes"
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE60} configure build install
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE59} configure build install
 %endif
+    %{l_prefix}/bin/perl-openpkg -d %{SOURCE60} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE61} configure build install
     %{l_prefix}/bin/perl-openpkg -d %{SOURCE62} configure build install
-    %{l_prefix}/bin/perl-openpkg -d %{SOURCE63} configure build install
 
     #   cleanup installation
     ( cd $RPM_BUILD_ROOT%{l_prefix}/bin