forked from pool/apache2-mod_perl
Accepting request 185907 from devel:languages:perl
- add avoid-broken-provides.diff to avoid package providing HTTP::Request::Common, which it does not (only for testing) OBS-URL: https://build.opensuse.org/request/show/185907 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=44
This commit is contained in:
committed by
Git OBS Bridge
parent
44b8f27708
commit
45d1864d55
@@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 5 09:23:12 UTC 2013 - coolo@suse.com
|
||||
|
||||
- add avoid-broken-provides.diff to avoid package providing
|
||||
HTTP::Request::Common, which it does not (only for testing)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 14:52:11 CEST 2013 - ro@suse.de
|
||||
|
||||
|
@@ -58,6 +58,7 @@ Source0: http://ftp.de.debian.org/debian/pool/main/liba/libapache2-mod-pe
|
||||
Patch: %{name}-2.0.4-tests.diff
|
||||
# PATCH-NEEDS-REBASE
|
||||
Patch1: lfs-perl-5.14.patch
|
||||
Patch2: avoid-broken-provides.diff
|
||||
Icon: mod_perl.xpm
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@@ -113,6 +114,7 @@ software depending on apache2-mod_perl.
|
||||
%prep
|
||||
#%setup -q -n modperl-2.0 -a 1
|
||||
%setup -q -n httpd24
|
||||
%patch2 -p1
|
||||
#%patch1 -p1
|
||||
find -name ".svn" -type d | xargs rm -rfv
|
||||
|
||||
|
12
avoid-broken-provides.diff
Normal file
12
avoid-broken-provides.diff
Normal file
@@ -0,0 +1,12 @@
|
||||
--- httpd24/Apache-Test/lib/Apache/TestRequest.pm
|
||||
+++ httpd24/Apache-Test/lib/Apache/TestRequest.pm
|
||||
@@ -43,7 +43,8 @@ unless ($ENV{APACHE_TEST_PRETEND_NO_LWP}
|
||||
require HTTP::Request::Common;
|
||||
|
||||
unless (defined &HTTP::Request::Common::OPTIONS) {
|
||||
- package HTTP::Request::Common;
|
||||
+ package
|
||||
+ HTTP::Request::Common;
|
||||
no strict 'vars';
|
||||
*OPTIONS = sub { _simple_req(OPTIONS => @_) };
|
||||
push @EXPORT, 'OPTIONS';
|
Reference in New Issue
Block a user