rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix hardcoded paths in ant script and conf

Browse Source
This commit is contained in:
Mikolaj Izdebski 2017-03-01 08:52:50 +01:00
parent e8cc1540f1
commit 53a97c8303
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ant.spec
View File

@ -36,7 +36,7 @@
Name: ant Name: ant
Version: 1.10.1 Version: 1.10.1
Release: 3%{?dist} Release: 4%{?dist}
Epoch: 0 Epoch: 0
Summary: Java build tool Summary: Java build tool
Summary(it): Tool per la compilazione di programmi java Summary(it): Tool per la compilazione di programmi java
@ -316,7 +316,7 @@ Test utility tasks for %{name}.
%package xz %package xz
Summary: Optional xz tasks for %{name} Summary: Optional xz tasks for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: xz Requires: xz-java
%description xz %description xz
Optional xz tasks for %{name}. Optional xz tasks for %{name}.
@ -365,6 +365,15 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
#install jars #install jars
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis hamcrest/core xz-java build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer xerces-j2 xml-commons-apis hamcrest/core xz-java
# fix hardcoded paths in ant script and conf
cp -p %{SOURCE2} %{name}.conf
sed -e 's:/etc/ant.conf:%{_synconfdir}/ant.conf:g' \
-e 's:/etc/ant.d:%{_synconfdir}/ant.d:g' \
-e 's:/usr/share/ant:%{_datadir}/ant:g' \
-e 's:/usr/bin/build-classpath:%{_bindir}/build-classpath:g' \
-e 's:/usr/share/java-utils/java-functions:%{_javadir}-utils/java-functions:g' \
-i src/script/ant %{name}.conf
# Fix file-not-utf8 rpmlint warning # Fix file-not-utf8 rpmlint warning
iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8 iconv KEYS -f iso-8859-1 -t utf-8 -o KEYS.utf8
mv KEYS.utf8 KEYS mv KEYS.utf8 KEYS
@ -440,7 +449,7 @@ ln -sf %{_bindir}/antRun $RPM_BUILD_ROOT%{ant_home}/bin/
# default ant.conf # default ant.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf
# OPT_JAR_LIST fragments # OPT_JAR_LIST fragments
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d
@ -611,6 +620,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Wed Mar 1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.1-4
- Fix hardcoded paths in ant script and conf
- Fix requires on xz-java
* Thu Feb 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.1-3 * Thu Feb 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.1-3
- Don't hardcode path to xargs - Don't hardcode path to xargs