This commit is contained in:
parent
2e09c28e68
commit
d1bc50c169
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 18 15:00:12 CET 2008 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- removed Requires: openssl-certs - doesn't exist on older dists
|
||||||
|
and is required by libopenssl otherwise
|
||||||
|
- allow to build the package even if the testsuite fails
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 8 10:21:10 CET 2008 - mmarek@suse.cz
|
Fri Feb 8 10:21:10 CET 2008 - mmarek@suse.cz
|
||||||
|
|
||||||
|
17
curl.spec
17
curl.spec
@ -10,12 +10,13 @@
|
|||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
Name: curl
|
Name: curl
|
||||||
BuildRequires: libidn-devel openldap2-devel openssl-devel zlib-devel
|
BuildRequires: libidn-devel openldap2-devel openssl-devel zlib-devel
|
||||||
# used by the testsuite
|
# used by the testsuite
|
||||||
BuildRequires: stunnel
|
BuildRequires: stunnel
|
||||||
Version: 7.18.0
|
Version: 7.18.0
|
||||||
Release: 5
|
Release: 10
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
License: BSD 3-Clause; X11/MIT
|
License: BSD 3-Clause; X11/MIT
|
||||||
Group: Productivity/Networking/Web/Utilities
|
Group: Productivity/Networking/Web/Utilities
|
||||||
@ -54,7 +55,6 @@ Authors:
|
|||||||
%package -n libcurl4
|
%package -n libcurl4
|
||||||
Summary: cURL shared library version 4
|
Summary: cURL shared library version 4
|
||||||
Group: Productivity/Networking/Web/Utilities
|
Group: Productivity/Networking/Web/Utilities
|
||||||
Requires: openssl-certs
|
|
||||||
|
|
||||||
%description -n libcurl4
|
%description -n libcurl4
|
||||||
cURL shared library version 4.
|
cURL shared library version 4.
|
||||||
@ -118,7 +118,14 @@ if test -z "$BUILD_INCARNATION"; then
|
|||||||
BUILD_INCARNATION=0
|
BUILD_INCARNATION=0
|
||||||
fi
|
fi
|
||||||
base=$((8990 + $BUILD_INCARNATION * 20))
|
base=$((8990 + $BUILD_INCARNATION * 20))
|
||||||
perl ./runtests.pl -a -b$base !279 # test 279 doesn't work with -b<num>
|
# test 279 doesn't work with -b<num>
|
||||||
|
perl ./runtests.pl -a -b$base !279 || {
|
||||||
|
%if 0%{?testsuite_nonfatal:1}
|
||||||
|
echo "WARNING: runtests.pl failed with code $?, continuing nevertheless"
|
||||||
|
%else
|
||||||
|
exit
|
||||||
|
%endif
|
||||||
|
}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
|
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
|
||||||
@ -160,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc %{_mandir}/man3/*
|
%doc %{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 18 2008 mmarek@suse.cz
|
||||||
|
- removed Requires: openssl-certs - doesn't exist on older dists
|
||||||
|
and is required by libopenssl otherwise
|
||||||
|
- allow to build the package even if the testsuite fails
|
||||||
* Fri Feb 08 2008 mmarek@suse.cz
|
* Fri Feb 08 2008 mmarek@suse.cz
|
||||||
- use /etc/ssl/certs instead of own curl-ca-bundle.crt
|
- use /etc/ssl/certs instead of own curl-ca-bundle.crt
|
||||||
* more up-to-date ca cert collection (bnc#334690)
|
* more up-to-date ca cert collection (bnc#334690)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user