Rename maven_plugin build conditional to bnd_maven_plugin
This commit is contained in:
parent
9ef9460aa2
commit
d369d886f2
@ -1,9 +1,9 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
%if %{without bootstrap} && !0%{?rhel}
|
||||
%bcond_without maven_plugin
|
||||
%bcond_without bnd_maven_plugin
|
||||
%else
|
||||
%bcond_with maven_plugin
|
||||
%bcond_with bnd_maven_plugin
|
||||
%endif
|
||||
|
||||
Name: aqute-bnd
|
||||
@ -40,7 +40,7 @@ BuildRequires: mvn(org.osgi:osgi.core)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-simple)
|
||||
%endif
|
||||
%if %{with maven_plugin}
|
||||
%if %{with bnd_maven_plugin}
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
|
||||
@ -76,7 +76,7 @@ Summary: BND library
|
||||
%description -n aqute-bndlib
|
||||
%{summary}.
|
||||
|
||||
%if %{with maven_plugin}
|
||||
%if %{with bnd_maven_plugin}
|
||||
%package -n bnd-maven-plugin
|
||||
Summary: BND Maven plugin
|
||||
|
||||
@ -102,7 +102,7 @@ rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteComman
|
||||
sed 's/@VERSION@/%{version}/' %SOURCE2 > pom.xml
|
||||
sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info
|
||||
|
||||
%if %{without maven_plugin}
|
||||
%if %{without bnd_maven_plugin}
|
||||
%pom_disable_module maven
|
||||
%endif
|
||||
|
||||
@ -185,7 +185,7 @@ popd
|
||||
%mvn_package biz.aQute.bnd:aQute.libg bndlib
|
||||
%mvn_package biz.aQute.bnd:parent __noinstall
|
||||
%mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall
|
||||
%if %{with maven_plugin}
|
||||
%if %{with bnd_maven_plugin}
|
||||
%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
|
||||
%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven
|
||||
%endif
|
||||
@ -209,7 +209,7 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
|
||||
%files -n aqute-bndlib -f .mfiles-bndlib
|
||||
%license LICENSE
|
||||
|
||||
%if %{with maven_plugin}
|
||||
%if %{with bnd_maven_plugin}
|
||||
%files -n bnd-maven-plugin -f .mfiles-maven
|
||||
%endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user