From d32870945b1525c2d1e9d2118eff2d941175243e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Dec 17 2012 13:24:16 +0000
Subject: Enable xbean-spring, resolves rhbz#887496


- Disable xbean-blueprint due to FTBFS

---

diff --git a/xbean.spec b/xbean.spec
index 608b6f5..616be61 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -2,14 +2,14 @@
 # when bootstrapping for new architectures
 %if 0%{?fedora}
 %bcond_without equinox
-#%%bcond_without spring
+%bcond_without spring
 %endif
 
 Name:           xbean
 Version:        3.12
 BuildArch:      noarch
 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java plugin based web server
 
 Group:          Development/Libraries
@@ -68,7 +68,6 @@ BuildRequires:  springframework-web
 %endif
 
 Requires:       java
-Requires:       jpackage-utils
 Requires:       apache-commons-logging
 Requires:       objectweb-asm
 Requires:       slf4j
@@ -88,6 +87,8 @@ lifecycle and class loader management, and a rock solid Spring
 integration.
 
 %if %{with spring}
+# For now blueprint module fails to compile. Disable it.
+%if 0
 %package        blueprint
 Summary:        Schema-driven namespace handler for Apache Aries Blueprint
 Requires:       %{name} = %{version}-%{release}
@@ -99,6 +100,7 @@ Requires:       pax-logging
 
 %description    blueprint
 This package provides %{summary}.
+%endif
 
 %package        classloader
 Summary:        A flexibie multi-parent classloader
@@ -140,7 +142,6 @@ This package provides %{summary}.
 %package        javadoc
 Summary:        API documentation for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 This package provides %{summary}.
@@ -162,11 +163,14 @@ rm src/site/site.xml
 # Prevent modules depending on springframework from building.
 %if %{without spring}
    %pom_remove_dep org.springframework:
-   %pom_disable_module xbean-blueprint
+   #%%pom_disable_module xbean-blueprint
    %pom_disable_module xbean-classloader
    %pom_disable_module xbean-spring
    %pom_disable_module maven-xbean-plugin
 %endif
+# blueprint FTBFS, disable for now
+%pom_disable_module xbean-blueprint
+
 
 # Replace generic OSGi dependencies with either Equinox or Felix
 %pom_remove_dep :org.osgi.core xbean-bundleutils
@@ -218,7 +222,7 @@ for sub in bundleutils classpath finder naming reflect; do
 done
 
 %if %{with spring}
-   for m in blueprint classloader spring; do
+   for m in classloader spring; do  # blueprint should be there too
        install -m 644 %{name}-${m}/target/%{name}-${m}-%{version}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}/%{name}-${m}.jar;
        install -pm 644 %{name}-${m}/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
        %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar -f ${m}
@@ -250,11 +254,13 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}
 
 %if %{with spring}
+%if 0
 %files blueprint
 %doc LICENSE NOTICE %{name}-blueprint/target/restaurant.xsd*
 %{_javadir}/%{name}/%{name}-blueprint.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}-blueprint.pom
 %{_mavendepmapfragdir}/%{name}-blueprint
+%endif
 
 %files classloader
 %doc LICENSE NOTICE
@@ -280,6 +286,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 17 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-4
+- Enable xbean-spring, resolves rhbz#887496
+- Disable xbean-blueprint due to FTBFS
+
 * Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.12-3
 - Replace eclipse-rcp requires with eclipse-equinox-osgi
 - Reenable Equinox