Do not build equinox specific parts for rhel.

This commit is contained in:
Alexander Kurtakov 2012-04-24 14:44:26 +03:00
parent 8879269d53
commit 46f8c21b3b

View File

@ -2,7 +2,7 @@ Name: xbean
Version: 3.8 Version: 3.8
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
@ -36,11 +36,13 @@ BuildRequires: maven-idea-plugin
BuildRequires: maven-install-plugin BuildRequires: maven-install-plugin
BuildRequires: maven-javadoc-plugin BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4 BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-site-plugin BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin BuildRequires: maven-shade-plugin
%if !0%{?rhel:1}
BuildRequires: eclipse-rcp BuildRequires: eclipse-rcp
%endif
Requires: java Requires: java
Requires: objectweb-asm Requires: objectweb-asm
@ -74,10 +76,19 @@ rm src/site/site.xml
# springframework will have to be brought in first # springframework will have to be brought in first
%patch0 -p1 %patch0 -p1
# Fix dependency on xbean-asm-shaded to original objectweb-asm # Fix dependency on xbean-asm-shaded to original objectweb-asm
sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \ sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 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|<groupId>org.eclipse|<groupId>org.apache.felix|g" xbean-bundleutils/pom.xml
sed -i "s|<artifactId>osgi|<artifactId>org.apache.felix.framework|g" xbean-bundleutils/pom.xml
%endif
%build %build
mvn-rpmbuild -e \ mvn-rpmbuild -e \
-Dmaven.local.depmap.file="%{SOURCE1}" \ -Dmaven.local.depmap.file="%{SOURCE1}" \
@ -122,6 +133,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Tue Apr 24 2012 Alexander Kurtakov <akurtako@redhat.com> 3.8-3
- Do not build equinox specific parts for RHEL.
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-2 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - 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 <sochotnicky@redhat.com> - 3.7-1 * Mon Jun 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.7-1
- First release - First release