SHA256
1
0
forked from pool/ant

- Revert the previous change as it broke the build of most java

software stack

- Revert the previous change as it broke the build of most java
  software stack

- Revert the previous change as it broke the build of most java
  software stack

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=77
This commit is contained in:
Tomáš Chvátal
2017-02-20 10:14:44 +00:00
committed by Git OBS Bridge
parent 5338d67552
commit 195afdfc36
8 changed files with 18 additions and 29 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 20 10:12:01 UTC 2017 - tchvatal@suse.com
- Revert the previous change as it broke the build of most java
software stack
-------------------------------------------------------------------
Mon Feb 13 15:54:30 UTC 2017 - guoyunhebrave@gmail.com

View File

@@ -47,8 +47,6 @@ 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
@@ -570,11 +568,6 @@ 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
@@ -635,8 +628,6 @@ 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

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 20 10:12:01 UTC 2017 - tchvatal@suse.com
- Revert the previous change as it broke the build of most java
software stack
-------------------------------------------------------------------
Mon Feb 13 15:54:30 UTC 2017 - guoyunhebrave@gmail.com

View File

@@ -47,8 +47,6 @@ 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
@@ -570,11 +568,6 @@ 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
@@ -635,8 +628,6 @@ 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

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 20 10:12:01 UTC 2017 - tchvatal@suse.com
- Revert the previous change as it broke the build of most java
software stack
-------------------------------------------------------------------
Mon Feb 13 15:54:30 UTC 2017 - guoyunhebrave@gmail.com

View File

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

1
ant.sh
View File

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

View File

@@ -46,8 +46,6 @@ 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
@@ -569,11 +567,6 @@ 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
@@ -634,8 +627,6 @@ 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