diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 6824b7b..f048e3b 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,5 +1,3 @@ -%bcond_without memcached -%bcond_without ehcache Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore @@ -17,12 +15,6 @@ BuildRequires: maven-local BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) -%if %{with ehcache} -BuildRequires: mvn(net.sf.ehcache:ehcache-core) -%endif -%if %{with memcached} -BuildRequires: mvn(net.spy:spymemcached) -%endif BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.httpcomponents:project:pom:) @@ -158,14 +150,10 @@ done # requires network rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java -%if %{without memcached} rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/memcached %pom_remove_dep :spymemcached httpclient-cache -%endif -%if %{without ehcache} rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache %pom_remove_dep :ehcache-core httpclient-cache -%endif %build %mvn_file ":{*}" httpcomponents/@1