[xbean] Replace eclipse-rcp requires with eclipse-equinox-osgi

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Oct 22 11:19:40 UTC 2012


commit 0bc30a9ee5e2c324c929256d09f1bf7f3923057e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Oct 22 13:18:41 2012 +0200

    Replace eclipse-rcp requires with eclipse-equinox-osgi

 xbean.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/xbean.spec b/xbean.spec
index a44f7ce..608b6f5 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,7 +1,7 @@
 # Conditionals to help breaking eclipse <-> xbean dependency cycle
 # when bootstrapping for new architectures
 %if 0%{?fedora}
-#%%bcond_without equinox
+%bcond_without equinox
 #%%bcond_without spring
 %endif
 
@@ -9,7 +9,7 @@ Name:           xbean
 Version:        3.12
 BuildArch:      noarch
 
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java plugin based web server
 
 Group:          Development/Libraries
@@ -43,7 +43,7 @@ BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-shade-plugin
 %if %{with equinox}
-BuildRequires:  eclipse-rcp
+BuildRequires:  eclipse-equinox-osgi
 %else
 BuildRequires:  felix-framework
 %endif
@@ -73,7 +73,7 @@ Requires:       apache-commons-logging
 Requires:       objectweb-asm
 Requires:       slf4j
 %if %{with equinox}
-Requires:       eclipse-rcp
+Requires:       eclipse-equinox-osgi
 %else
 Requires:       felix-framework
 %endif
@@ -280,6 +280,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Oct 22 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.12-3
+- Replace eclipse-rcp requires with eclipse-equinox-osgi
+- Reenable Equinox
+
 * Tue Oct 16 2012 gil cattaneo <puntogil at libero.it> - 3.12-2
 - Enable xbean-blueprint and xbean-classloader modules
 


More information about the scm-commits mailing list