From dcc865d447c0cbc84503e3bd3a18869acebb6df3af31a201a28252aeea3e4b80 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 18 Jun 2010 03:58:32 +0000
Subject: [PATCH] Accepting request 41607 from devel:libraries:c_c++

checked in (request 41607)

OBS-URL: https://build.opensuse.org/request/show/41607
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=39
---
 curl.changes |  5 -----
 curl.spec    | 22 +---------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/curl.changes b/curl.changes
index 8e3770c..bab915a 100644
--- a/curl.changes
+++ b/curl.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Jun  2 14:12:54 UTC 2010 - lnussel@suse.de
-
-- allowing switching to nss instead of openssl via bcond
-
 -------------------------------------------------------------------
 Mon May 10 01:12:22 UTC 2010 - crrodriguez@opensuse.org
 
diff --git a/curl.spec b/curl.spec
index b2f830f..1d6c565 100644
--- a/curl.spec
+++ b/curl.spec
@@ -17,18 +17,9 @@
 
 # norootforbuild
 
-%bcond_without openssl
-%bcond_with mozilla_nss
-%bcond_without testsuite
 
 Name:           curl
-BuildRequires:  libidn-devel openldap2-devel pkg-config zlib-devel
-%if %{with openssl}
-BuildRequires:  openssl-devel
-%endif
-%if %{with mozilla_nss}
-BuildRequires:  mozilla-nss-devel
-%endif
+BuildRequires:  libidn-devel openldap2-devel openssl-devel pkg-config zlib-devel
 %if 0%{suse_version} > 930
 BuildRequires:  krb5-devel
 %else
@@ -97,15 +88,8 @@ export CFLAGS="$RPM_OPT_FLAGS"
 ./configure \
 	--prefix=%{_prefix} \
 	--enable-ipv6 \
-%if %{with openssl}
 	--with-ssl \
 	--with-ca-path=/etc/ssl/certs/ \
-%else
-	--without-ssl \
-%if %{with mozilla_nss}
-	--with-nss \
-%endif
-%endif
 %if %suse_version > 930
 	--with-gssapi=/usr/lib/mit \
 %else
@@ -119,9 +103,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
 ./libtool --config | grep -q link_all_deplibs=no
 # enable-hidden-symbols needs gcc4 and causes that curl exports only its API
 make %{?jobs:-j%jobs}
-
-%if %{with testsuite}
-%check
 cd tests
 make
 # make sure the testsuite runs don't race on MP machines in autobuild
@@ -139,7 +120,6 @@ perl ./runtests.pl -a -b$base || {
 	echo "WARNING: runtests.pl failed with code $?, continuing nevertheless"
 %endif
 }
-%endif
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}