rpms/xbean
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Replace eclipse-rcp requires with eclipse-equinox-osgi

Browse Source
This commit is contained in:
Mikolaj Izdebski 2012-10-22 13:18:41 +02:00
parent 7b4e68eca0
commit 0bc30a9ee5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xbean.spec
View File

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