diff --git a/ant-antlr.changes b/ant-antlr.changes index ece2fd0..0003ef0 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -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 diff --git a/ant-antlr.spec b/ant-antlr.spec index 596f7e3..1677120 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -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 diff --git a/ant-junit.changes b/ant-junit.changes index ece2fd0..0003ef0 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -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 diff --git a/ant-junit.spec b/ant-junit.spec index fd64f03..04ceea9 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -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 diff --git a/ant.changes b/ant.changes index ece2fd0..0003ef0 100644 --- a/ant.changes +++ b/ant.changes @@ -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 diff --git a/ant.csh b/ant.csh deleted file mode 100644 index 9ee201f..0000000 --- a/ant.csh +++ /dev/null @@ -1 +0,0 @@ -setenv ANT_HOME /usr/share/ant/ diff --git a/ant.sh b/ant.sh deleted file mode 100644 index 734a761..0000000 --- a/ant.sh +++ /dev/null @@ -1 +0,0 @@ -export ANT_HOME=/usr/share/ant/ diff --git a/ant.spec b/ant.spec index 8eb61d6..2aa020f 100644 --- a/ant.spec +++ b/ant.spec @@ -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