@@ -1,7 +1,7 @@

 Summary:	Ant contrib

 Name:		ant-contrib

 Version:	1.0b3

-Release:	11%{?dist}

+Release:	12%{?dist}

 License:	Apache

 URL:		http://ant-contrib.sourceforget.net

 Group:		Applications/System

@@ -10,11 +10,11 @@ Distribution: 	Photon

 BuildArch:      noarch

 Source0:	http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}-src.tar.gz

 %define sha1 ant-contrib=b28d2bf18656b263611187fa9fbb95cec93d47c8

-BuildRequires: openjre8 >= %{JAVA8_VERSION}

-BuildRequires: openjdk8 >= %{JAVA8_VERSION}

-BuildRequires: apache-ant >= %{ANT_VERSION}

-Requires: openjre8 >= %{JAVA8_VERSION}

-Requires: apache-ant >= %{ANT_VERSION}

+BuildRequires: openjre8

+BuildRequires: openjdk8

+BuildRequires: apache-ant

+Requires: openjre8

+Requires: apache-ant

 %define _prefix /var/opt/ant-contrib

 %description

@@ -24,24 +24,27 @@ The Ant Contrib project is a collection of tasks for Apache Ant.

 %setup -n %{name}

 find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +

+%clean

+rm -rf %{buildroot}

+

 %build

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

-mkdir -p -m 700 %{_prefix}

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-$ANT_HOME/bin/ant -Ddist.dir="%{_prefix}" -Dproject.version="1.0b3" dist

+ant -Ddist.dir="." -Dproject.version=%{version} dist

+

 %install

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-ANT_CONTRIB_DIST_DIR=%{buildroot}%{name}-%{version}

-[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*

 mkdir -p -m 700 %{buildroot}/var/opt

-cd %{buildroot}/var/opt && tar xvzf %{_prefix}/ant-contrib-1.0b3-bin.tar.gz --wildcards "*.jar"

+cd %{buildroot}/var/opt && tar xvzf %{_builddir}/%{name}/%{name}-%{version}-bin.tar.gz --wildcards "*.jar"

 %files

 %defattr(-,root,root)

+%dir %{_prefix}

+%dir %{_prefix}/lib

 %{_prefix}/*.jar

 %{_prefix}/lib/*.jar

 %changelog

+*   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 1.0b3-12

+-   Removed dependency on ANT_HOME

 *   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0b3-11

 -   Renamed openjdk to openjdk8

 *   Fri Apr 07 2017 Divya Thaluru <dthaluru@vmware.com> 1.0b3-10

@@ -1,7 +1,7 @@

 Summary:	Apache Ant

 Name:		apache-ant

 Version:	1.10.1

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	Apache

 URL:		http://ant.apache.org

 Group:		Applications/System

@@ -14,39 +14,61 @@ Source1:	http://hamcrest.googlecode.com/files/hamcrest-1.3.tar.gz

 %define sha1 hamcrest=f0ab4d66186b894a06d89d103c5225cf53697db3

 Source2:    http://dl.bintray.com/vmware/photon_sources/1.0/maven-ant-tasks-2.1.3.tar.gz

 %define sha1 maven-ant-tasks=f38c0cc7b38007b09638366dbaa4ee902d9c255b

-Requires: openjre8 >= %{JAVA8_VERSION}, python2

-BuildRequires: openjre8 >= %{JAVA8_VERSION}

-BuildRequires: openjdk8 >= %{JAVA8_VERSION}

-%define _prefix /var/opt/apache-ant-%{version}

+Requires: openjre8, python2

+BuildRequires: openjre8

+BuildRequires: openjdk8

+%define _prefix /var/opt/%{name}

 %define _bindir %{_prefix}/bin

 %define _libdir %{_prefix}/lib

 %description

 The Ant package contains binaries for a build system

+%package -n ant-scripts

+Summary:        Additional scripts for ant

+Requires:       %{name} = %{version}

+%description -n ant-scripts

+Apache Ant is a Java-based build tool.

+

+This package contains additional perl and python scripts for Apache

+Ant.

+

 %prep

 %setup -q

 tar xf %{SOURCE1} --no-same-owner

 tar xf %{SOURCE2} --no-same-owner

+

+%clean

+rm -rf %{buildroot}

+

 %build

-ANT_DIST_DIR=/var/opt/apache-ant-%{version}

+ANT_DIST_DIR=%{buildroot}%{_prefix}

 cp -v ./hamcrest-1.3/hamcrest-core-1.3.jar ./lib/optional

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

 mkdir -p -m 700 $ANT_DIST_DIR

 ./bootstrap.sh && ./build.sh -Ddist.dir=$ANT_DIST_DIR

 %install

+cp %{_builddir}/%{name}-%{version}/maven-ant-tasks-2.1.3/maven-ant-tasks-2.1.3.jar %{buildroot}/%{_libdir}/

+mkdir -p %{buildroot}%{_datadir}/java/ant

-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*

-

-mkdir -p -m 700 %{buildroot}/var/opt

-

-cp -r /var/opt/apache-ant-%{version} %{buildroot}/var/opt

+for jar in %{buildroot}/%{_libdir}/*.jar

+do

+    jarname=$(basename $jar .jar)

+    ln -sfv %{_libdir}/${jarname}.jar %{buildroot}%{_datadir}/java/ant/${jarname}.jar

+done

+rm -rf %{buildroot}%{_bindir}/*.bat

+rm -rf %{buildroot}%{_bindir}/*.cmd

-cp %{_builddir}/%{name}-%{version}/maven-ant-tasks-2.1.3/maven-ant-tasks-2.1.3.jar %{buildroot}/%{_libdir}/

+mkdir -p %{buildroot}/bin

+for b in %{buildroot}%{_bindir}/*

+do

+    binaryname=$(basename $b)

+    ln -sfv %{_bindir}/${binaryname} %{buildroot}/bin/${binaryname}

+done

-MAVEN_ANT_TASKS_DIR=%{buildroot}/var/opt/%{name}-%{version}/maven-ant-tasks

+MAVEN_ANT_TASKS_DIR=%{buildroot}%{_prefix}/maven-ant-tasks

 mkdir -p -m 700 $MAVEN_ANT_TASKS_DIR

 cp %{_builddir}/%{name}-%{version}/maven-ant-tasks-2.1.3/LICENSE $MAVEN_ANT_TASKS_DIR/

@@ -55,21 +77,37 @@ cp %{_builddir}/%{name}-%{version}/maven-ant-tasks-2.1.3/README.txt $MAVEN_ANT_T

 chown -R root:root $MAVEN_ANT_TASKS_DIR

 chmod 644 $MAVEN_ANT_TASKS_DIR/*

-install -d -m 755 %{buildroot}/etc/profile.d/

-

-cat >> %{buildroot}/etc/profile.d/%{name}.sh <<- "EOF"

-export ANT_HOME=/var/opt/%{name}-%{version}

-export PATH="$PATH:$ANT_HOME/bin"

-EOF

-

 %files

 %defattr(-,root,root)

-%{_bindir}/*

+%dir %{_bindir}

+%dir %{_libdir}

+%dir %{_datadir}/java/ant

+%dir %{_prefix}/maven-ant-tasks

+/bin/ant

+/bin/antRun

+%{_bindir}/ant

+%{_bindir}/antRun

 %{_libdir}/*

-%{_prefix}/maven-ant-tasks/*

-%{_sysconfdir}/profile.d/%{name}.sh

+%{_datadir}/java/ant/*.jar

+%{_prefix}/maven-ant-tasks/LICENSE

+%{_prefix}/maven-ant-tasks/README.txt

+%{_prefix}/maven-ant-tasks/NOTICE

+

+%files -n ant-scripts

+%defattr(-,root,root)

+/bin/antRun.pl

+/bin/complete-ant-cmd.pl

+/bin/runant.py

+/bin/runant.pl

+%{_bindir}/antRun.pl

+%{_bindir}/complete-ant-cmd.pl

+%{_bindir}/runant.py

+%{_bindir}/runant.pl

 %changelog

+*   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 1.10.1-4

+-   Removed dependency on ANT_HOME

+-   Moved perl and python scripts to ant-scripts package

 *   Mon Jun 05 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.10.1-3

 -   Fixed the profile.d/apache-ant.sh script to include ant in $PATH

 *   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.10.1-2

@@ -1,7 +1,7 @@

 Summary:	Apache Maven

 Name:		apache-maven

 Version:	3.5.0

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	Apache

 URL:		http://maven.apache.org

 Group:		Applications/System

@@ -10,14 +10,14 @@ Distribution: 	Photon

 BuildArch:      x86_64

 Source0:	http://apache.mirrors.lucidnetworks.net//maven/source/%{name}-%{version}-src.tar.gz

 %define sha1 apache-maven=1730812af1cdd77493e269b371ef8ac536230c15

-BuildRequires: openjre8 >= %{JAVA8_VERSION}

-BuildRequires: openjdk8 >= %{JAVA8_VERSION}

-BuildRequires: apache-ant >= %{ANT_VERSION}

+BuildRequires: openjre8

+BuildRequires: openjdk8

+BuildRequires: apache-ant

 BuildRequires: wget >= 1.15

-Requires: openjre8 >= %{JAVA8_VERSION}

+Requires: openjre8

 Requires: which

-%define _prefix /var/opt/apache-maven-%{version}

+%define _prefix /var/opt/%{name}

 %define _bindir %{_prefix}/bin

 %define _libdir %{_prefix}/lib

@@ -29,48 +29,60 @@ The Maven package contains binaries for a build system

 %setup -q

 #find . -name build.xml | xargs sed -i 's/timeout="600000"/timeout="1200000"/g'

+%clean

+rm -rf %{buildroot}

+

 %build

-MAVEN_DIST_DIR=%{_prefix}

+MAVEN_DIST_DIR=%{buildroot}%{_prefix}

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

-export PATH=$PATH:$ANT_HOME/bin

-source /etc/profile.d/apache-maven.sh

 sed -i 's/www.opensource/opensource/g' DEPENDENCIES

 mvn -DdistributionTargetDir=$MAVEN_DIST_DIR clean package

 %install

-MAVEN_DIST_DIR=%{_prefix}

-

-[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*

-mkdir -p -m 700 %{buildroot}/var/opt

+mkdir -p %{buildroot}%{_datadir}/java/maven

-cp -r "$MAVEN_DIST_DIR"  %{buildroot}/var/opt

+for jar in %{buildroot}/%{_libdir}/*.jar

+do

+    jarname=$(basename $jar .jar)

+    ln -sfv %{_libdir}/${jarname}.jar %{buildroot}%{_datadir}/java/maven/${jarname}.jar

+done

-# install exports file.

-install -d -m 755 %{buildroot}/etc/profile.d/

-echo 'export MAVEN_HOME=/var/opt/%{name}-%{version}' > %{buildroot}/etc/profile.d/%{name}.sh

-echo 'export PATH=$MAVEN_HOME/bin:$PATH' >> %{buildroot}/etc/profile.d/%{name}.sh

-echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh

+mkdir -p %{buildroot}/bin

+for b in %{buildroot}%{_bindir}/*

+do

+    binaryname=$(basename $b)

+    ln -sfv %{_bindir}/${binaryname} %{buildroot}/bin/${binaryname}

+done

 %files

 %defattr(-,root,root)

-%{_libdir}

-%{_bindir}

-%{_sysconfdir}/profile.d/%{name}.sh

-%{_prefix}/LICENSE

-%{_prefix}/NOTICE

-%{_prefix}/README.txt

+%dir %{_libdir}

+%dir %{_bindir}

+%dir %{_prefix}/conf

+%dir %{_prefix}/boot

+%dir %{_datadir}/java/maven

+%{_libdir}/*

+%{_bindir}/*

+/bin/*

+%{_datadir}/java/maven/*.jar

 %{_prefix}/boot/plexus-classworlds-2.5.2.jar

 %{_prefix}/conf/logging/simplelogger.properties

 %{_prefix}/conf/settings.xml

 %{_prefix}/conf/toolchains.xml

+%{_prefix}/LICENSE

+%{_prefix}/NOTICE

+%{_prefix}/README.txt

 %exclude %{_libdir}/jansi-native

 %changelog

-*	Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.0-2

--	Renamed openjdk to openjdk8

+*   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 3.5.0-3

+-   Removed dependency on ANT_HOME

+-   Removed apache-maven profile file

+-   Removed version from directory path

+*   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.0-2

+-   Renamed openjdk to openjdk8

 *   Mon Apr 24 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.5.0-1

 -   Updated apache-maven to version 3.5.0

 *   Fri Mar 31 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-8

@@ -1,7 +1,7 @@

 Summary:	Apache Tomcat

 Name:		apache-tomcat

 Version:	8.5.15

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache

 URL:		http://tomcat.apache.org

 Group:		Applications/System

@@ -10,17 +10,19 @@ Distribution: 	Photon

 BuildArch:      noarch

 Source0:    http://apache.mirrors.ionfish.org/tomcat/tomcat-8/v%{version}/src/%{name}-%{version}-src.tar.gz

 %define sha1 apache-tomcat=5f26f71a1a3730020254a76aca1ee2615bd12d02

-BuildRequires: openjre8 >= %{JAVA8_VERSION}

-BuildRequires: openjdk8 >= %{JAVA8_VERSION}

-BuildRequires: apache-ant >= %{ANT_VERSION}

-Requires: openjre8 >= %{JAVA8_VERSION}

-Requires: apache-ant >= %{ANT_VERSION}

+BuildRequires: openjre8

+BuildRequires: openjdk8

+BuildRequires: apache-ant

+Requires: openjre8

+Requires: apache-ant

-%define _prefix /var/opt/%{name}-%{version}

+%define _prefix /var/opt/%{name}

 %define _bindir %{_prefix}/bin

 %define _confdir %{_prefix}/conf

 %define _libdir %{_prefix}/lib

 %define _webappsdir %{_prefix}/webapps

+%define _logsdir %{_prefix}/logs

+%define _tempdir %{_prefix}/temp

 %description

 The Apache Tomcat package contains binaries for the Apache Tomcat servlet container.

@@ -32,9 +34,8 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "

    -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete

 %build

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

 mkdir -p -m 700 %{_prefix}

-$ANT_HOME/bin/ant -Dbase.path="." deploy dist-prepare dist-source javadoc

+ant -Dbase.path="." deploy dist-prepare dist-source javadoc

 %install

 mkdir -p -m 700 %{buildroot}%{_prefix}

@@ -42,6 +43,8 @@ mkdir -p -m 700 %{buildroot}%{_bindir}

 mkdir -p -m 700 %{buildroot}%{_libdir}

 mkdir -p -m 700 %{buildroot}%{_confdir}

 mkdir -p -m 700 %{buildroot}%{_webappsdir}

+mkdir -p -m 700 %{buildroot}%{_logsdir}

+mkdir -p -m 700 %{buildroot}%{_tempdir}

 cp -r %{_builddir}/%{name}-%{version}-src/output/build/bin/* %{buildroot}%{_bindir}

 cp -r %{_builddir}/%{name}-%{version}-src/output/build/lib/* %{buildroot}%{_libdir}

 cp -r %{_builddir}/%{name}-%{version}-src/output/build/conf/* %{buildroot}%{_confdir}

@@ -50,8 +53,17 @@ cp -r %{_builddir}/%{name}-%{version}-src/output/build/webapps/* %{buildroot}%{_

 cp %{_builddir}/%{name}-%{version}-src/LICENSE %{buildroot}%{_prefix}

 cp %{_builddir}/%{name}-%{version}-src/NOTICE %{buildroot}%{_prefix}

-rm -rf %{buildroot}/var/opt/%{name}-%{version}/webapps/examples

-rm -rf %{buildroot}/var/opt/%{name}-%{version}/webapps/docs

+touch %{buildroot}%{_logsdir}/catalina.out

+rm -rf %{buildroot}%{_prefix}/webapps/examples

+rm -rf %{buildroot}%{_prefix}/webapps/docs

+

+mkdir -p %{buildroot}%{_datadir}/java/tomcat

+

+for jar in %{buildroot}/%{_libdir}/*.jar

+do

+    jarname=$(basename $jar .jar)

+    ln -sfv %{_libdir}/${jarname}.jar %{buildroot}%{_datadir}/java/tomcat/${jarname}.jar

+done

 %clean

 rm -rf %{buildroot}/*

@@ -63,14 +75,21 @@ rm -rf %{buildroot}/*

 %dir %{_libdir}

 %dir %{_confdir}

 %dir %{_webappsdir}

-%{_prefix}/LICENSE

-%{_prefix}/NOTICE

+%dir %{_logsdir}

+%dir %{_tempdir}

 %{_bindir}/*

 %{_confdir}/*

 %{_libdir}/*

 %{_webappsdir}/*

+%{_datadir}/java/tomcat/*.jar

+%{_prefix}/LICENSE

+%{_prefix}/NOTICE

+%{_logsdir}/catalina.out

 %changelog

+*   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 8.5.15-2

+-   Removed version from directory path

+-   Removed dependency on ANT_HOME

 *   Tue Jun 6 2017 Divya Thaluru <dthaluru@vmware.com> 8.5.15-1

 -   Upgraded to version 8.5.15

 *   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 8.5.13-3

@@ -3,7 +3,7 @@

 Summary:        Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store

 Name:           cassandra

 Version:        3.10

-Release:        1%{?dist}

+Release:        2%{?dist}

 URL:            http://cassandra.apache.org/

 License:        Apache License, Version 2.0

 Group:          Applications/System

@@ -15,8 +15,8 @@ Source1:		cassandra.service

 Patch0:			build-fix.patch

 BuildRequires:  apache-ant

 BuildRequires:	unzip zip

-BuildRequires:	openjdk8 >= %{JAVA8_VERSION}

-Requires:       openjre8 >= %{JAVA8_VERSION}

+BuildRequires:	openjdk8

+Requires:       openjre8

 %description

 Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store. Cassandra brings together the distributed systems technologies from Dynamo and the log-structured storage engine from Google's BigTable.

@@ -25,7 +25,6 @@ Cassandra is a highly scalable, eventually consistent, distributed, structured k

 %patch0 -p1

 %build

-source /etc/profile.d/apache-ant.sh

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

 ant jar javadoc -Drelease=true

@@ -118,5 +117,7 @@ fi

 /lib/systemd/system/cassandra.service

 %changelog

+*   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 3.10-2

+-   Removed dependency on ANT_HOME

 *   Mon May 08 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-1

 -   Initial build. First version

@@ -1,7 +1,7 @@

 Summary:	Apache Commons Daemon

 Name:		commons-daemon

 Version:	1.0.15

-Release:	10%{?dist}

+Release:	11%{?dist}

 License:	Apache

 URL:		http://commons.apache.org/proper/commons-daemon

 Group:		Applications/System

@@ -10,24 +10,25 @@ Distribution: 	Photon

 BuildArch:      x86_64

 Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz

 %define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3

-BuildRequires: openjre8 >= %{JAVA8_VERSION}

-BuildRequires: openjdk8 >= %{JAVA8_VERSION}

-BuildRequires: apache-ant >= %{ANT_VERSION}

-Requires: openjre8 >= %{JAVA8_VERSION}

-

-%define _prefix /var/opt/%{name}-%{version}

-%define _bindir %{_prefix}/bin

+BuildRequires: openjre8

+BuildRequires: openjdk8

+BuildRequires: apache-ant

+Requires: openjre8

 %description

-The JNA package contains libraries for interop from Java to native libraries.

+The Daemon Component contains a set of Java and native code, including a set of Java interfaces applications must implement and Unix native

+code to control a Java daemon from a Unix operating system.

 %prep

 %setup -q -n %{name}-%{version}-src

+

+%clean

+rm -rf %{buildroot}

+

 %build

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-$ANT_HOME/bin/ant dist

+ant dist

 export CFLAGS=-m64

 export LDFLAGS=-m64

@@ -40,25 +41,26 @@ cd $CURDIR

 %install

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

-DIST_DIR=%{buildroot}%{_prefix}

-

-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*

+DIST_DIR=%{buildroot}%{_datadir}/java

 mkdir -p -m 755 $DIST_DIR

-mkdir -p -m 755 $DIST_DIR/bin

+mkdir -p -m 755 %{buildroot}%{_bindir}

-cp %{_builddir}/%{name}-%{version}-src/src/native/unix/jsvc $DIST_DIR/bin

-cp %{_builddir}/%{name}-%{version}-src/dist/%{name}-%{version}.jar $DIST_DIR

+cp %{_builddir}/%{name}-%{version}-src/src/native/unix/jsvc %{buildroot}%{_bindir}

+cp %{_builddir}/%{name}-%{version}-src/dist/%{name}-%{version}.jar $DIST_DIR/%{name}.jar

 chmod -R 755 $DIST_DIR

 %files

 %defattr(-,root,root)

 %{_bindir}/jsvc

-%{_prefix}/*.jar

+%{_datadir}/java/*.jar

 %changelog

+*   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 1.0.15-11

+-   Packaged jar files to /usr/share/java

+-   Removed version information from jar files

+-   Removed dependency on ANT_HOME

 *   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0.15-10

 -   Renamed openjdk to openjdk8

 *   Fri Mar 31 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.15-9

@@ -4,7 +4,7 @@

 Summary:        Java Native Access

 Name:           jna

 Version:        4.4.0

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        Apache

 URL:            http://github.com/twall/jna

 Group:          Applications/System

@@ -13,12 +13,12 @@ Distribution:   Photon

 BuildArch:      x86_64

 Source0:        https://github.com/java-native-access/jna/archive/%{version}/%{name}-%{version}.tar.gz

 %define sha1 jna=d9b54e98393a696f458468bc8f3167f701a9ea9f

-BuildRequires: openjre8 >= %{JAVA8_VERSION}

-BuildRequires: openjdk8 >= %{JAVA8_VERSION}

-BuildRequires: apache-ant >= %{ANT_VERSION}

-Requires:      openjre8 >= %{JAVA8_VERSION}

+BuildRequires: openjre8

+BuildRequires: openjdk8

+BuildRequires: apache-ant

+Requires:      openjre8

-%define _prefix /var/opt/jna-4.4.0

+%define _prefix /var/opt/%{name}-%{version}

 %description

 The JNA package contains libraries for interop from Java to native libraries.

@@ -34,26 +34,27 @@ Sources for JNA

 %prep

 %setup -q

+

+%clean

+rm -rf %{buildroot}

+

 %build

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

 #disabling all tests

-$ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/*.java" -Drelease=true

+ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/*.java" -Drelease=true

 #$ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/LibraryLoadTest.java" -Drelease=true

 %install

 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}

 export JNA_DIST_DIR=%{buildroot}%{_prefix}

-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*

-

 mkdir -p -m 700 $JNA_DIST_DIR

-$ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true

+ant -Ddist=$JNA_DIST_DIR dist -Drelease=true

 %files

 %defattr(-,root,root)

+%dir %{_prefix}

 %{_prefix}/*.jar

 %exclude %{_prefix}/*javadoc.jar

 %exclude %{_prefix}/*sources.jar

@@ -70,6 +71,8 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true

 %{_prefix}/*.aar

 %changelog

+*   Mon Jun 19 2017 Divya Thaluru <dthaluru@vmware.com> 4.4.0-5

+-   Removed dependency on ANT_HOME

 *   Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.4.0-4

 -   Renamed openjdk to openjdk8

 *   Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.4.0-3

@@ -48,12 +48,12 @@ VMware Lightwave Server

 %define _webappsdir %{_prefix}/vmware-sts/webapps

 %define _configdir %{_datadir}/config

 %define _servicedir /lib/systemd/system

-%define _commons_daemon_home /var/opt/commons-daemon-1.0.15

-%define _tomcat_home /var/opt/apache-tomcat-8.5.13

+%define _commons_daemon_home /var/opt/commons-daemon

+%define _tomcat_home /var/opt/apache-tomcat

 %define _jaxws_home /opt/jaxws-ri-2.2.10

 %define _java_home /usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}

-%define _ant_home /var/opt/apache-ant-%{ANT_VERSION}

-%define _maven_home /var/opt/apache-maven-%{MAVEN_VERSION}

+%define _ant_home /var/opt/apache-ant

+%define _maven_home /var/opt/apache-maven

 %if 0%{?_likewise_open_prefix:1} == 0

 %define _likewise_open_prefix /opt/likewise

@@ -1120,6 +1120,8 @@ fi

 # %doc ChangeLog README COPYING

 %changelog

+*   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 1.2.1-3

+-   Fixed apache-maven directory path

 *   Tue Jun 06 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.2.1-3

 -   fix domainjoin and allow publish of oidc xml

 *   Thu Jun 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.2.1-2

@@ -350,14 +350,6 @@ class constants(object):

         java8version = constants.specData.getVersion("openjre8")

         constants.specData.addMacro("JAVA8_VERSION",java8version)

-        #adding apache-ant version rpm macro

-        antversion = constants.specData.getVersion("apache-ant")

-        constants.specData.addMacro("ANT_VERSION", antversion)

-

-        #adding apache-maven version rpm macro

-        mavenversion = constants.specData.getVersion("apache-maven")

-        constants.specData.addMacro("MAVEN_VERSION", mavenversion)

-

         #adding kernelrelease rpm macro

         kernelrelease = constants.specData.getRelease("linux")

         constants.specData.addMacro("KERNEL_RELEASE",kernelrelease)