Accepting request 686215 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/686215 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=77
This commit is contained in:
commit
ab2661d962
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Make "if" statements in build recipe POSIX sh compatible.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ant-antlr
|
# spec file for package ant
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2000-2009, JPackage Project
|
# Copyright (c) 2000-2009, JPackage Project
|
||||||
@ -477,20 +477,20 @@ do
|
|||||||
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
||||||
|
|
||||||
#bootstrap does not have a pom
|
#bootstrap does not have a pom
|
||||||
if [ $jarname == ant-bootstrap ]; then
|
if [ "$jarname" = ant-bootstrap ]; then
|
||||||
mkdir -p src/etc/poms/${jarname}
|
mkdir -p src/etc/poms/${jarname}
|
||||||
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#install pom
|
#install pom
|
||||||
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
||||||
if [ $jarname == ant-launcher ]; then
|
if [ "$jarname" = ant-launcher ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
||||||
elif [ $jarname == ant-jmf ]; then
|
elif [ "$jarname" = ant-jmf ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
||||||
elif [ $jarname == ant-swing ]; then
|
elif [ "$jarname" = ant-swing ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
||||||
elif [ $jarname == ant ]; then
|
elif [ "$jarname" = ant ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
||||||
else
|
else
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Make "if" statements in build recipe POSIX sh compatible.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ant-junit
|
# spec file for package ant
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2000-2009, JPackage Project
|
# Copyright (c) 2000-2009, JPackage Project
|
||||||
@ -477,20 +477,20 @@ do
|
|||||||
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
||||||
|
|
||||||
#bootstrap does not have a pom
|
#bootstrap does not have a pom
|
||||||
if [ $jarname == ant-bootstrap ]; then
|
if [ "$jarname" = ant-bootstrap ]; then
|
||||||
mkdir -p src/etc/poms/${jarname}
|
mkdir -p src/etc/poms/${jarname}
|
||||||
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#install pom
|
#install pom
|
||||||
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
||||||
if [ $jarname == ant-launcher ]; then
|
if [ "$jarname" = ant-launcher ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
||||||
elif [ $jarname == ant-jmf ]; then
|
elif [ "$jarname" = ant-jmf ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
||||||
elif [ $jarname == ant-swing ]; then
|
elif [ "$jarname" = ant-swing ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
||||||
elif [ $jarname == ant ]; then
|
elif [ "$jarname" = ant ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
||||||
else
|
else
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Make "if" statements in build recipe POSIX sh compatible.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ant-junit5
|
# spec file for package ant
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2000-2009, JPackage Project
|
# Copyright (c) 2000-2009, JPackage Project
|
||||||
@ -477,20 +477,20 @@ do
|
|||||||
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
||||||
|
|
||||||
#bootstrap does not have a pom
|
#bootstrap does not have a pom
|
||||||
if [ $jarname == ant-bootstrap ]; then
|
if [ "$jarname" = ant-bootstrap ]; then
|
||||||
mkdir -p src/etc/poms/${jarname}
|
mkdir -p src/etc/poms/${jarname}
|
||||||
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#install pom
|
#install pom
|
||||||
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
||||||
if [ $jarname == ant-launcher ]; then
|
if [ "$jarname" = ant-launcher ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
||||||
elif [ $jarname == ant-jmf ]; then
|
elif [ "$jarname" = ant-jmf ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
||||||
elif [ $jarname == ant-swing ]; then
|
elif [ "$jarname" = ant-swing ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
||||||
elif [ $jarname == ant ]; then
|
elif [ "$jarname" = ant ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
||||||
else
|
else
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Make "if" statements in build recipe POSIX sh compatible.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
10
ant.spec
10
ant.spec
@ -476,20 +476,20 @@ do
|
|||||||
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar
|
||||||
|
|
||||||
#bootstrap does not have a pom
|
#bootstrap does not have a pom
|
||||||
if [ $jarname == ant-bootstrap ]; then
|
if [ "$jarname" = ant-bootstrap ]; then
|
||||||
mkdir -p src/etc/poms/${jarname}
|
mkdir -p src/etc/poms/${jarname}
|
||||||
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#install pom
|
#install pom
|
||||||
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
|
||||||
if [ $jarname == ant-launcher ]; then
|
if [ "$jarname" = ant-launcher ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
|
||||||
elif [ $jarname == ant-jmf ]; then
|
elif [ "$jarname" = ant-jmf ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf
|
||||||
elif [ $jarname == ant-swing ]; then
|
elif [ "$jarname" = ant-swing ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing
|
||||||
elif [ $jarname == ant ]; then
|
elif [ "$jarname" = ant ]; then
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
|
||||||
else
|
else
|
||||||
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
|
||||||
|
Loading…
x
Reference in New Issue
Block a user