Browse code
Splitting apache-ant to repackage scripts to separate RPMS
Change-Id: I2b1174c21d6a350aeb9905959b829a8b1a22041b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3089
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>
Tested-by: Divya Thaluru <dthaluru@vmware.com>
Kumar Kaushik authored on 2017/06/29 07:07:42Showing 1 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Apache Ant |
| 2 | 2 |
Name: apache-ant |
| 3 | 3 |
Version: 1.9.6 |
| 4 |
-Release: 8%{?dist}
|
|
| 4 |
+Release: 9%{?dist}
|
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://ant.apache.org |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -14,7 +14,7 @@ Source1: http://hamcrest.googlecode.com/files/hamcrest-1.3.tar.gz |
| 14 | 14 |
%define sha1 hamcrest=f0ab4d66186b894a06d89d103c5225cf53697db3 |
| 15 | 15 |
Source2: http://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz |
| 16 | 16 |
%define sha1 maven-ant-tasks=f38c0cc7b38007b09638366dbaa4ee902d9c255b |
| 17 |
-Requires: openjre, python2 |
|
| 17 |
+Requires: openjre |
|
| 18 | 18 |
BuildRequires: openjre |
| 19 | 19 |
BuildRequires: openjdk |
| 20 | 20 |
%define _prefix /var/opt/%{name}
|
| ... | ... |
@@ -24,6 +24,17 @@ BuildRequires: openjdk |
| 24 | 24 |
%description |
| 25 | 25 |
The Ant package contains binaries for a build system |
| 26 | 26 |
|
| 27 |
+%package -n ant-scripts |
|
| 28 |
+Summary: Additional scripts for ant |
|
| 29 |
+Requires: %{name} = %{version}
|
|
| 30 |
+Requires: python2 |
|
| 31 |
+%description -n ant-scripts |
|
| 32 |
+Apache Ant is a Java-based build tool. |
|
| 33 |
+ |
|
| 34 |
+This package contains additional perl and python scripts for Apache |
|
| 35 |
+Ant. |
|
| 36 |
+ |
|
| 37 |
+ |
|
| 27 | 38 |
%prep |
| 28 | 39 |
|
| 29 | 40 |
%setup -q |
| ... | ... |
@@ -77,35 +88,40 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/* |
| 77 | 77 |
%dir %{_prefix}/maven-ant-tasks
|
| 78 | 78 |
/bin/ant |
| 79 | 79 |
/bin/antRun |
| 80 |
+%{_bindir}/ant
|
|
| 81 |
+%{_bindir}/antRun
|
|
| 82 |
+%{_libdir}/*
|
|
| 83 |
+%{_datadir}/java/ant/*.jar
|
|
| 84 |
+%{_prefix}/maven-ant-tasks/LICENSE
|
|
| 85 |
+%{_prefix}/maven-ant-tasks/README.txt
|
|
| 86 |
+%{_prefix}/maven-ant-tasks/NOTICE
|
|
| 87 |
+ |
|
| 88 |
+%files -n ant-scripts |
|
| 89 |
+%defattr(-,root,root) |
|
| 80 | 90 |
/bin/antRun.pl |
| 81 | 91 |
/bin/complete-ant-cmd.pl |
| 82 | 92 |
/bin/runant.py |
| 83 | 93 |
/bin/runant.pl |
| 84 |
-%{_bindir}/ant
|
|
| 85 |
-%{_bindir}/antRun
|
|
| 86 | 94 |
%{_bindir}/antRun.pl
|
| 87 | 95 |
%{_bindir}/complete-ant-cmd.pl
|
| 88 | 96 |
%{_bindir}/runant.py
|
| 89 | 97 |
%{_bindir}/runant.pl
|
| 90 |
-%{_libdir}/*
|
|
| 91 |
-%{_datadir}/java/ant/*.jar
|
|
| 92 |
-%{_prefix}/maven-ant-tasks/LICENSE
|
|
| 93 |
-%{_prefix}/maven-ant-tasks/README.txt
|
|
| 94 |
-%{_prefix}/maven-ant-tasks/NOTICE
|
|
| 95 | 98 |
|
| 96 | 99 |
%changelog |
| 100 |
+* Wed Jun 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.9.6-9 |
|
| 101 |
+- Moved perl and python scripts to ant-scripts package |
|
| 97 | 102 |
* Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 1.9.6-8 |
| 98 | 103 |
- Removed dependency on ANT_HOME |
| 99 | 104 |
* Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-7 |
| 100 | 105 |
- Use Java alternatives |
| 101 |
-* Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-6 |
|
| 102 |
-- Update java to 1.8.0.131 & use java macros to update version |
|
| 106 |
+* Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-6 |
|
| 107 |
+- Update java to 1.8.0.131 & use java macros to update version |
|
| 103 | 108 |
* Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-5 |
| 104 | 109 |
- Updated JAVA_HOME path to point to latest JDK. |
| 105 | 110 |
* Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-4 |
| 106 | 111 |
- Updated JAVA_HOME path to point to latest JDK. |
| 107 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-3 |
|
| 108 |
-- GA - Bump release of all rpms |
|
| 112 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-3 |
|
| 113 |
+- GA - Bump release of all rpms |
|
| 109 | 114 |
* Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 1.9.6-2 |
| 110 | 115 |
- Updated JAVA_HOME path to point to latest JDK. |
| 111 | 116 |
* Tue Feb 29 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-1 |