diff --git a/ant-antlr.changes b/ant-antlr.changes index adb9d80..ece2fd0 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -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 diff --git a/ant-antlr.spec b/ant-antlr.spec index 41e4f55..596f7e3 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -47,6 +47,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 @@ -477,14 +479,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 @@ -568,6 +570,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 @@ -628,6 +635,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 diff --git a/ant-junit.changes b/ant-junit.changes index adb9d80..ece2fd0 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -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 diff --git a/ant-junit.spec b/ant-junit.spec index 65a322e..fd64f03 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -47,6 +47,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 @@ -477,14 +479,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 @@ -568,6 +570,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 @@ -628,6 +635,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