From f250f111a4b91f4789e5a7eff296da0eeeaad125 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Feb 01 2017 12:12:28 +0000
Subject: Fix build with conditionals


---

diff --git a/xbean.spec b/xbean.spec
index b585102..d7e9fb1 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,13 +1,11 @@
 # Conditionals to help breaking eclipse <-> xbean dependency cycle
 # when bootstrapping for new architectures
-%if 0%{?fedora}
 %bcond_without equinox
 %bcond_without spring
-%endif
 
 Name:           xbean
 Version:        4.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java plugin based web server
 License:        ASL 2.0
 URL:            http://geronimo.apache.org/xbean/
@@ -21,49 +19,36 @@ Patch0:         0001-Unshade-ASM.patch
 Patch1:         0002-Port-to-Eclipse-Luna-OSGi.patch
 Patch2:         0003-Port-to-QDox-2.0.patch
 
-BuildRequires:  java-devel
-BuildRequires:  apache-commons-beanutils
-BuildRequires:  apache-commons-logging
-BuildRequires:  objectweb-asm
-BuildRequires:  ant
-BuildRequires:  qdox
-BuildRequires:  slf4j
 BuildRequires:  maven-local
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-antrun-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-site-plugin
-BuildRequires:  maven-shade-plugin
-BuildRequires:  maven-source-plugin
+BuildRequires:  mvn(commons-logging:commons-logging-api)
+BuildRequires:  mvn(log4j:log4j:1.2.12)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.groovy:groovy-all)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
+BuildRequires:  mvn(org.ow2.asm:asm)
+BuildRequires:  mvn(org.ow2.asm:asm-commons)
+BuildRequires:  mvn(org.slf4j:slf4j-api)
+
 %if %{with equinox}
-BuildRequires:  eclipse-equinox-osgi
-%else
-BuildRequires:  felix-framework
+BuildRequires:  mvn(org.eclipse:osgi)
 %endif
+
 %if %{with spring}
-BuildRequires:  apache-commons-jexl
-BuildRequires:  aries-blueprint
-# test deps
-BuildRequires:  cglib
-BuildRequires:  felix-osgi-compendium
-BuildRequires:  felix-osgi-core
-BuildRequires:  geronimo-annotation
-BuildRequires:  pax-logging
-
-BuildRequires:  maven-archiver
-BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-project
-BuildRequires:  plexus-archiver
-BuildRequires:  plexus-utils
-BuildRequires:  springframework
-BuildRequires:  springframework-beans
-BuildRequires:  springframework-context
-BuildRequires:  springframework-web
+BuildRequires:  mvn(ant:ant)
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
+BuildRequires:  mvn(org.apache.maven:maven-archiver)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.apache.maven:maven-project)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.springframework:spring-beans)
+BuildRequires:  mvn(org.springframework:spring-context)
+BuildRequires:  mvn(org.springframework:spring-web)
 %endif
 
 %description
@@ -149,10 +134,9 @@ rm src/site/site.xml
 %pom_disable_module xbean-blueprint
 
 %if %{without equinox}
-  # Replace Eclipse Equinox OSGi dependency with Apeche Felix
-  rm -rf xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/equinox/
-  %pom_remove_dep org.eclipse:osgi xbean-bundleutils
-  %pom_add_dep org.apache.felix:org.apache.felix.framework xbean-bundleutils
+  %pom_remove_dep :xbean-bundleutils xbean-finder
+  rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
+  %pom_disable_module xbean-bundleutils
 %endif
 
 # maven-xbean-plugin invocation makes no sense as there are no namespaces
@@ -195,6 +179,9 @@ sed -i "s|</Private-Package>|</Private-Package-->|" xbean-blueprint/pom.xml
 %doc LICENSE NOTICE
 
 %changelog
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-5
+- Fix build with conditionals
+
 * Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 4.5-4
 - Port to current QDox