SHA256
1
0
forked from pool/ant

Accepting request 456881 from home:guoyunhebrave:branches:Java:packages

Fix bug#1025015
https://bugzilla.opensuse.org/show_bug.cgi?id=1025015

OBS-URL: https://build.opensuse.org/request/show/456881
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=75
This commit is contained in:
Tomáš Chvátal 2017-02-14 09:53:27 +00:00 committed by Git OBS Bridge
parent 5a1953a058
commit 9d6a8ad696
6 changed files with 21 additions and 5 deletions

View File

@ -1,7 +1,7 @@
#
# spec file for package ant-antlr
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#

View File

@ -1,7 +1,7 @@
#
# spec file for package ant-junit
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 13 15:54:30 UTC 2017 - guoyunhebrave@gmail.com
- Add profile.d scripts to set ANT_HOME
-------------------------------------------------------------------
Fri Jan 15 22:01:37 UTC 2016 - opensuse@dstoecker.de

1
ant.csh Normal file
View File

@ -0,0 +1 @@
setenv ANT_HOME /usr/share/ant/

1
ant.sh Normal file
View File

@ -0,0 +1 @@
export ANT_HOME=/usr/share/ant/

View File

@ -1,7 +1,7 @@
#
# spec file for package ant
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@ -46,6 +46,8 @@ Source1: apache-ant-1.8.ant.conf
Source1000: pre_checkin.sh
Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc
Source1002: ant.keyring
Source2: ant.csh
Source3: ant.sh
Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
@ -476,14 +478,14 @@ rm build/lib/ant-junit*.jar
# remove all others
for i in build/lib/ant-*.jar ; do
case $i in
*/ant-junit*)
*/ant-junit*)
;;
*)
rm -v $i
;;
esac
done
%endif
%endif
for jar in build/lib/*.jar
do
@ -567,6 +569,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/ant.d
mkdir -p %{buildroot}%{_sysconfdir}
cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf
# ANT_HOME environment variable
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
cp -p %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d
# OPT_JAR_LIST fragments
echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf
echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing
@ -627,6 +634,8 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%defattr(0644,root,root,0755)
%doc KEYS LICENSE NOTICE README WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_sysconfdir}/profile.d/ant.csh
%{_sysconfdir}/profile.d/ant.sh
%attr(0755,root,root) %{_bindir}/ant
%attr(0755,root,root) %{_bindir}/antRun
%{_javadir}/%{name}.jar