OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Aug-2007 00:46:10
Branch: HEAD Handle: 2007082523460602
Modified files:
openpkg-src/perl-net perl-net.spec
openpkg-src/perl-www perl-www.spec
Log:
Curl::easy has been superseded by WWW::Curl, which now fits better the
perl-www package than perl-net
Summary:
Revision Changes Path
1.163 +17 -36 openpkg-src/perl-net/perl-net.spec
1.363 +24 -1 openpkg-src/perl-www/perl-www.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-net/perl-net.spec
============================================================================
$ cvs diff -u -r1.162 -r1.163 perl-net.spec
--- openpkg-src/perl-net/perl-net.spec 26 Jul 2007 05:18:15 -0000
1.162
+++ openpkg-src/perl-net/perl-net.spec 25 Aug 2007 22:46:06 -0000
1.163
@@ -38,7 +38,6 @@
%define V_net_telnet 3.03
%define V_net_telnet_cisco 1.10
%define V_plrpc 0.2020
-%define V_curl_easy 1.35
%define V_net_imap_simple 1.14
%define V_net_bgp 0.08
%define V_net_pcap 0.14
@@ -65,10 +64,9 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20070726
+Release: 20070826
# package options
-%option with_curl no
%option with_pcap no
# list of sources
@@ -87,20 +85,19 @@
Source12:
http://www.cpan.org/modules/by-module/Net/Net-Telnet-Cisco-%{V_net_telnet_cisco}.tar.gz
Source13:
http://www.cpan.org/modules/by-module/Net/Net-Radius-%{V_net_radius}.tar.gz
Source14:
http://www.cpan.org/modules/by-module/RPC/PlRPC-%{V_plrpc}.tar.gz
-Source15:
http://curl.haxx.se/libcurl/perl/Curl-easy-%{V_curl_easy}.tar.gz
-Source16:
http://www.cpan.org/modules/by-module/Net/Net-IMAP-Simple-%{V_net_imap_simple}.tar.gz
-Source17:
http://www.cpan.org/modules/by-module/Net/Net-BGP-%{V_net_bgp}.tar.gz
-Source18:
http://www.cpan.org/modules/by-module/Net/Net-Pcap-%{V_net_pcap}.tar.gz
-Source19:
http://www.cpan.org/modules/by-module/Class/Class-Gomor-%{V_class_gomor}.tar.gz
-Source20:
http://www.cpan.org/modules/by-module/Net/Net-Packet-%{V_net_packet}.tar.gz
-Source21:
http://www.cpan.org/modules/by-module/Net/Net-IP-%{V_net_ip}.tar.gz
-Source22:
http://www.cpan.org/modules/by-module/Net/Net-XMPP-%{V_net_xmpp}.tar.gz
-Source23:
http://www.cpan.org/modules/by-module/Net/Net-Jabber-%{V_net_jabber}.tar.gz
-Source24:
http://www.cpan.org/modules/by-module/Net/Net-Patricia-%{V_net_patricia}.tar.gz
-Source25:
http://www.cpan.org/modules/by-module/Net/Net-IRC-%{V_net_irc}.tar.gz
-Source26:
http://www.cpan.org/modules/by-module/IP/IP-Country-%{V_ip_country}.tar.gz
-Source27:
http://www.cpan.org/modules/by-module/IO/IO-Socket-Multicast-%{V_io_socket_multicast}.tar.gz
-Source28:
http://www.cpan.org/modules/by-module/Net/Net-GrowlClient-%{V_net_growlclient}.tar.gz
+Source15:
http://www.cpan.org/modules/by-module/Net/Net-IMAP-Simple-%{V_net_imap_simple}.tar.gz
+Source16:
http://www.cpan.org/modules/by-module/Net/Net-BGP-%{V_net_bgp}.tar.gz
+Source17:
http://www.cpan.org/modules/by-module/Net/Net-Pcap-%{V_net_pcap}.tar.gz
+Source18:
http://www.cpan.org/modules/by-module/Class/Class-Gomor-%{V_class_gomor}.tar.gz
+Source19:
http://www.cpan.org/modules/by-module/Net/Net-Packet-%{V_net_packet}.tar.gz
+Source20:
http://www.cpan.org/modules/by-module/Net/Net-IP-%{V_net_ip}.tar.gz
+Source21:
http://www.cpan.org/modules/by-module/Net/Net-XMPP-%{V_net_xmpp}.tar.gz
+Source22:
http://www.cpan.org/modules/by-module/Net/Net-Jabber-%{V_net_jabber}.tar.gz
+Source23:
http://www.cpan.org/modules/by-module/Net/Net-Patricia-%{V_net_patricia}.tar.gz
+Source24:
http://www.cpan.org/modules/by-module/Net/Net-IRC-%{V_net_irc}.tar.gz
+Source25:
http://www.cpan.org/modules/by-module/IP/IP-Country-%{V_ip_country}.tar.gz
+Source26:
http://www.cpan.org/modules/by-module/IO/IO-Socket-Multicast-%{V_io_socket_multicast}.tar.gz
+Source27:
http://www.cpan.org/modules/by-module/Net/Net-GrowlClient-%{V_net_growlclient}.tar.gz
Patch0: perl-net.patch
# build information
@@ -110,10 +107,6 @@
PreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
BuildPreReq: perl-crypto, perl-sys, perl-time, perl-xml, perl-util >=
%{V_perl}-20040210
PreReq: perl-crypto, perl-sys, perl-time, perl-xml, perl-util >=
%{V_perl}-20040210
-%if "%{with_curl}" == "yes"
-BuildPreReq: curl
-PreReq: curl
-%endif
%if "%{with_pcap}" == "yes"
BuildPreReq: libpcap
PreReq: libpcap
@@ -147,9 +140,6 @@
- Net::Radius (%{V_net_radius})
- RPC::PlServer, RPC::PlClient (%{V_plrpc})
- Net::IP (%{V_net_ip})
-%if "%{with_curl}" == "yes"
- - Curl::easy (%{V_curl_easy})
-%endif
- Net::IMAP::Simple (%{V_net_imap_simple})
- Net::BGP (%{V_net_bgp})
%if "%{with_pcap}" == "yes"
@@ -168,11 +158,6 @@
- Net::GrowlClient (%{V_net_growlclient})
%track
- prog perl-net:Curl-easy = {
- version = %{V_curl_easy}
- url = http://curl.haxx.se/libcurl/perl/
- regex = Curl-easy-(__VER__)\.tar\.gz
- }
prog perl-net:Net-Netmask = {
version = %{V_net_netmask}
url = http://www.cpan.org/modules/by-module/Net/
@@ -343,7 +328,6 @@
%setup -q -T -D -a 25
%setup -q -T -D -a 26
%setup -q -T -D -a 27
- %setup -q -T -D -a 28
sed <%{PATCH0} -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0 -b
%build
@@ -366,19 +350,17 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE12} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE13} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE14} configure build install
-%if "%{with_curl}" == "yes"
%{l_prefix}/bin/perl-openpkg -d %{SOURCE15} configure build install
-%endif
%{l_prefix}/bin/perl-openpkg -d %{SOURCE16} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE17} configure build install
%if "%{with_pcap}" == "yes"
+ %{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} \
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE19} \
-A "INC='-I. %{l_cppflags}'" \
-A "LIBS='%{l_ldflags} -lpcap'" \
configure build install
%endif
+ %{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 -d %{SOURCE23} configure build install
@@ -386,7 +368,6 @@
%{l_prefix}/bin/perl-openpkg -d %{SOURCE25} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE26} configure build install
%{l_prefix}/bin/perl-openpkg -d %{SOURCE27} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE28} 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`
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.spec
============================================================================
$ cvs diff -u -r1.362 -r1.363 perl-www.spec
--- openpkg-src/perl-www/perl-www.spec 22 Aug 2007 21:18:11 -0000
1.362
+++ openpkg-src/perl-www/perl-www.spec 25 Aug 2007 22:46:08 -0000
1.363
@@ -63,6 +63,7 @@
%define V_soap_lite_smartproxy 0.11
%define V_soap_payload 1.02
%define V_net_google 1.0.1
+%define V_www_curl 3.02
%define V_www_mechanize 1.30
%define V_www_mechanize_cached 1.32
%define V_www_mechanize_formfi 0.06
@@ -96,7 +97,10 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20070822
+Release: 20070826
+
+# package options
+%option with_curl no
# list of sources
Source0: http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
@@ -159,6 +163,7 @@
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
Patch0: perl-www.patch
# build information
@@ -168,6 +173,10 @@
PreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
BuildPreReq: perl-crypto, perl-ssl, perl-mail, perl-xml, perl-net,
perl-time, perl-util, perl-module, perl-comp
PreReq: perl-crypto, perl-ssl, perl-mail, perl-xml, perl-net,
perl-time, perl-util, perl-module, perl-comp
+%if "%{with_curl}" == "yes"
+BuildPreReq: curl
+PreReq: curl
+%endif
AutoReq: no
AutoReqProv: no
@@ -204,6 +213,9 @@
- SOAP::Lite::SmartProxy (%{V_soap_lite_smartproxy})
- SOAP::payload (%{V_soap_payload})
- Net::Google (%{V_net_google})
+%if "%{with_curl}" == "yes"
+ - WWW::Curl (%{V_www_curl})
+%endif
- WWW::Mechanize (%{V_www_mechanize})
- WWW::Mechanize-Cached (%{V_www_mechanize_cached})
- WWW::Mechanize-FormFiller (%{V_www_mechanize_formfi})
@@ -422,6 +434,11 @@
url = http://www.cpan.org/modules/by-module/Net/
regex = Net-Google-(__VER__)\.tar\.gz
}
+ prog perl-www:Curl = {
+ version = %{V_www_curl}
+ url = http://www.cpan.org/modules/by-module/WWW/
+ regex = WWW-Curl-(__VER__)\.tar\.gz
+ }
prog perl-www:WWW-Mechanize = {
version = %{V_www_mechanize}
url = http://www.cpan.org/modules/by-module/WWW/
@@ -595,6 +612,9 @@
%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
+%endif
%patch -p0
%build
@@ -662,6 +682,9 @@
%{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
+%endif
# cleanup installation
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
