From 46f8c21b3b5af258a166b670e0f9a1e2c341efde Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Apr 24 2012 11:44:26 +0000 Subject: Do not build equinox specific parts for rhel. --- diff --git a/xbean.spec b/xbean.spec index c4b1700..1e4afb4 100644 --- a/xbean.spec +++ b/xbean.spec @@ -2,7 +2,7 @@ Name: xbean Version: 3.8 BuildArch: noarch -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java plugin based web server Group: Development/Libraries @@ -36,11 +36,13 @@ BuildRequires: maven-idea-plugin BuildRequires: maven-install-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 BuildRequires: maven-site-plugin BuildRequires: maven-shade-plugin +%if !0%{?rhel:1} BuildRequires: eclipse-rcp +%endif Requires: java Requires: objectweb-asm @@ -74,10 +76,19 @@ rm src/site/site.xml # springframework will have to be brought in first %patch0 -p1 + # Fix dependency on xbean-asm-shaded to original objectweb-asm sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java +# Do not build equinox specific part for rhel. +%if 0%{?rhel} > 6 +rm -fr xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/equinox/ +sed -i "s|org.eclipse|org.apache.felix|g" xbean-bundleutils/pom.xml +sed -i "s|osgi|org.apache.felix.framework|g" xbean-bundleutils/pom.xml +%endif + + %build mvn-rpmbuild -e \ -Dmaven.local.depmap.file="%{SOURCE1}" \ @@ -122,6 +133,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadocdir}/%{name} %changelog +* Tue Apr 24 2012 Alexander Kurtakov 3.8-3 +- Do not build equinox specific parts for RHEL. + * Sat Jan 14 2012 Fedora Release Engineering - 3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -153,4 +167,3 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : * Mon Jun 21 2010 Stanislav Ochotnicky - 3.7-1 - First release -