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

 Summary:	Ant contrib

 Name:		ant-contrib

 Version:	1.0b3

-Release:	0%{?dist}

+Release:	1%{?dist}

 License:	Apache

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

 Group:		Applications/System

@@ -10,9 +10,9 @@ 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

-Requires: openjdk >= 1.8.0.45, apache-ant >= 1.9.4

-BuildRequires: openjdk >= 1.8.0.45, apache-ant >= 1.9.4

-

+Requires: openjre >= 1.8.0.45, apache-ant >= 1.9.4

+BuildRequires: openjre >= 1.8.0.45, apache-ant >= 1.9.4

+BuildRequires: openjdk >= 1.8.0.45

 %define _prefix /opt/ant-contrib

 %description

@@ -38,5 +38,7 @@ cd %{buildroot}/opt && tar xvzf %{_prefix}/ant-contrib-1.0b3-bin.tar.gz --wildca

 %{_prefix}/lib/*.jar

 %changelog

-*   Fri Jun 9 2015 Sriram Nambakam <snambakam@vmware.com> 1.0b3.0-0

+*   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0b3.0-1

+-	Updated dependencies after repackaging openjdk. 

+*   Tue Jun 9 2015 Sriram Nambakam <snambakam@vmware.com> 1.0b3.0-0

 -   Initial commit

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

 Summary:	Apache Ant

 Name:		apache-ant

 Version:	1.9.4

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache

 URL:		http://ant.apache.org

 Group:		Applications/System

@@ -14,9 +14,9 @@ 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: openjdk >= 1.8.0.45, python2

+Requires: openjre >= 1.8.0.45, python2

+BuildRequires: openjre >= 1.8.0.45

 BuildRequires: openjdk >= 1.8.0.45

-

 %define _prefix /opt/apache-ant-1.9.4

 %define _bindir %{_prefix}/bin

 %define _libdir %{_prefix}/lib

@@ -66,6 +66,8 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/*

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

 %changelog

+*   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.4-2

+-	Updated dependencies after repackaging openjdk.

 *   Wed Aug 12 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4

 -   Added maven ant tasks

 *	Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4

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

 Summary:	Apache Maven

 Name:		apache-maven

 Version:	3.3.3

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache

 URL:		http://maven.apache.org

 Group:		Applications/System

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

 BuildArch:       noarch

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

 %define sha1 apache-maven=70301d0669bc86cd81b25a05b1daab3c6ca23595

-Requires: openjdk >= 1.8.0.45

-BuildRequires: openjdk >= 1.8.0.45, apache-ant >= 1.9.4, wget >= 1.15

+Requires: openjre >= 1.8.0.45

+BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.4, wget >= 1.15

 %define _prefix /opt/apache-maven-3.3.3

 %define _bindir %{_prefix}/bin

@@ -61,6 +61,8 @@ echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh

 %{_prefix}/conf/toolchains.xml

 %changelog

+*   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.3-2

+-	Updated dependencies after repackaging openjdk.

 *	Thu Jul 9 2015 	Sarah Choi<sarahc@vmware.com> 3.3.3-1

 -	Add a script to set environment variables for MAVEN 

 *	Fri May 22 2015 Sriram Nambakam <snambakam@vmware.com> 1.9.4

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

 Summary:	Apache Tomcat

 Name:		apache-tomcat

 Version:	7.0.63

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache

 URL:		http://tomcat.apache.org

 Group:		Applications/System

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

 BuildArch:      noarch

 Source0:	http://mirrors.gigenet.com/apache/tomcat/tomcat-7/v7.0.63/src/%{name}-%{version}.tar.gz

 %define sha1 apache-tomcat=ddd520f6df2414f10b6b0832dcacd7889f2dbff0

-Requires: openjdk >= 1.8.0.45

+Requires: openjre >= 1.8.0.45

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

 %define _bindir %{_prefix}/bin

@@ -51,5 +51,7 @@ rm -rf %{buildroot}/*

 %{_webappsdir}/*

 %changelog

+*	Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 7.0.63-2

+-	Updated dependency after repackaging openjdk. 

 *	Wed Jul 8 2015 Sriram Nambakam <snambakam@vmware.com> 7.0.63

 -	Initial build.	First version

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

 Summary:	Apache Commons Daemon

 Name:		commons-daemon

 Version:	1.0.15

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	Apache

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

 Group:		Applications/System

@@ -10,8 +10,8 @@ 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

-Requires: openjdk >= 1.8.0.45

-BuildRequires: openjdk >= 1.8.0.45, apache-ant >= 1.9.4

+Requires: openjre >= 1.8.0.45

+BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.4

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

 %define _bindir %{_prefix}/bin

@@ -58,5 +58,7 @@ chmod -R 755 $DIST_DIR

 %{_prefix}/*.jar

 %changelog

+*   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0.15-2

+-	Updated dependencies after repackaging openjdk. 

 *   Wed Jul 15 2015 Sriram Nambakam <snambakam@vmware.com> 1.0.15-1

 -   Initial commit

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

 Summary:	Jax WS Reference Implementation

 Name:		jaxws-ri

 Version:	2.2.5

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	CDDL-1.0, GPLv2

 URL:		http://jax-ws.java.net/2.2.5

 Group:		Applications/System

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

 BuildArch:      noarch

 Source0:	http://jax-ws.java.net/2.2.5/%{name}-%{version}.tar.gz

 %define sha1 jaxws-ri=b48b4592bd75991838d1ec003158f6b4ae05ebff

-Requires: openjdk >= 1.8.0.45

+Requires: openjre >= 1.8.0.45

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

 %define _bindir %{_prefix}/bin

@@ -46,5 +46,7 @@ rm -rf %{buildroot}/*

 %{_libdir}/*.jar

 %changelog

+*	Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.2.5-2

+-	Updated dependency after repackaging openjdk.

 *	Thu Jul 9 2015 Sriram Nambakam <snambakam@vmware.com> 2.2.5

 -	Initial build.	First version

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

 Summary:	Java Native Access

 Name:		jna

 Version:	4.1.0

-Release:	0%{?dist}

+Release:	1%{?dist}

 License:	Apache

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

 Group:		Applications/System

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

 BuildArch:      x86_64

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

 %define sha1 jna=c520c1be533619d3cbc3ad448d49a8f24ee60bda

-Requires: openjdk >= 1.8.0.45

-BuildRequires: openjdk >= 1.8.0.45, apache-ant >= 1.9.4

+Requires: openjre >= 1.8.0.45

+BuildRequires: openjre >= 1.8.0.45, openjdk >= 1.8.0.45, apache-ant >= 1.9.4

 %define _prefix /opt/jna-4.1.0

@@ -63,5 +63,7 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true

 %{_prefix}/*sources.jar

 %changelog

+*   Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.1.0-1

+-	Updated dependencies after repackaging openjdk. 

 *   Fri May 29 2015 Sriram Nambakam <snambakam@vmware.com> 4.1.0-0

 -   Initial commit

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

 Summary:	Mesos

 Name:		mesos

 Version:	0.23.0

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	Apache

 URL:		http://mesos.apache.org

 Group:		Applications/System

@@ -9,7 +9,8 @@ Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source0:	http://mirror.sdunix.com/apache/%{name}/%{version}/%{name}-%{version}.tar.gz

 %define sha1 mesos=05006a8a2752a089f40823d1c9ec795476ed0b93

-BuildRequires:	openjdk >= 1.8.0.45

+BuildRequires:	openjre >= 1.8.0.45

+BuildRequires:  openjdk >= 1.8.0.45

 BuildRequires:	curl

 BuildRequires:	apache-maven >= 3.3.3

 BuildRequires:	apr >= 1.5.2

@@ -25,7 +26,7 @@ Requires:	apr >= 1.5.2

 Requires:	apr-util >= 1.5.4

 Requires:	cyrus-sasl >= 2.1.26

 Requires:	expat

-Requires:	openjdk >= 1.8.0.45

+Requires:	openjre >= 1.8.0.45

 Requires:	subversion >= 1.8.13

 %description

@@ -80,6 +81,8 @@ make DESTDIR=%{buildroot} install

 %exclude %{_libdir}/debug/

 %changelog

+*	Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar.com> 0.23.0-3

+-	Updated the dependencies after repackaging the openjdk. 

 *	Tue Sep 08 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.23.0-2

 -	Move headers, pc, dev libs into devel pkg.

 *	Tue Sep 01 2015 Vinay Kulkarni <kulkarniv@vmware.com> 0.23.0-1

@@ -2,7 +2,7 @@

 Summary:	OpenJDK 

 Name:		openjdk

 Version:	1.8.0.51

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GNU GPL

 URL:		https://openjdk.java.net

 Group:		Development/Tools

@@ -14,6 +14,35 @@ Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-%{version}/OpenJD

 %description

 The OpenJDK package installs java class library and javac java compiler. 

+%package	-n openjre

+Summary:	Jave runtime environtment

+AutoReqProv: 	no

+%description	-n openjre

+It contains the libraries files for Java runtime environment

+#%global __requires_exclude ^libgif.*$

+#%filter_from_requires ^libgif.*$

+

+%package		sample

+Summary:		Sample java applications. 

+Group:          Development/Languages/Java

+%description	sample

+It contains the Sample java applications.

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

+

+%package		doc

+Summary:		Documentation and demo applications for openjdk

+Group:          Development/Languages/Java

+%description	doc

+It contains the documentation and demo applications for openjdk

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

+

+%package 		src

+Summary:        OpenJDK Java classes for developers

+Group:          Development/Languages/Java

+%description	src

+This package provides the runtime library class sources. 

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

+

 %prep -p exit

 %setup -qn OpenJDK-%{version}-x86_64-bin

 %build

@@ -27,16 +56,44 @@ install -vdm644 %{buildroot}/etc/profile.d

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

 export CLASSPATH=.:/usr/share/java

 export JAVA_HOME=/opt/OpenJDK-%{version}-bin

-export PATH="$PATH:/opt/OpenJDK-1.8.0.51-bin/bin:/opt/OpenJDK-1.8.0.51-bin/jre/bin"

+export PATH="$PATH:/opt/OpenJDK-%{version}-bin/bin:/opt/OpenJDK-%{version}-bin/jre/bin"

 EOF

 %clean

 rm -rf %{buildroot}/*

+

 %files

 %defattr(-,root,root)

-/opt/OpenJDK-%{version}-bin/*

+/opt/OpenJDK-%{version}-bin/ASSEMBLY_EXCEPTION

+/opt/OpenJDK-%{version}-bin/LICENSE

+/opt/OpenJDK-%{version}-bin/release

+/opt/OpenJDK-%{version}-bin/THIRD_PARTY_README

+/opt/OpenJDK-%{version}-bin/lib

+/opt/OpenJDK-%{version}-bin/include/

+

+%files	-n openjre

+%defattr(-,root,root)

+/opt/OpenJDK-%{version}-bin/jre/ 

+/opt/OpenJDK-%{version}-bin/bin

+/opt/OpenJDK-%{version}-bin/lib/amd64/jli/

 /etc/profile.d/java-exports.sh

+

+%files sample

+%defattr(-,root,root)

+/opt/OpenJDK-%{version}-bin/sample/

+

+%files doc

+%defattr(-,root,root)

+/opt/OpenJDK-%{version}-bin/man/

+/opt/OpenJDK-%{version}-bin/demo

+

+%files src

+%defattr(-,root,root)

+/opt/OpenJDK-%{version}-bin/src.zip

+

 %changelog

+*	Fri Sep 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.51-2

+-	Split the openjdk into multiple sub-packages to reduce size. 

 *	Mon Aug 17 2015 Sharath George <sarahc@vmware.com> 1.8.0.51-1

 -	Moved to the next version

 *	Tue Jun 30 2015 Sarah Choi <sarahc@vmware.com> 1.8.0.45-2

new file mode 100644

@@ -0,0 +1,37 @@

+Summary:	Noninteractive ssh password provider 

+Name:		sshpass

+Version:	1.05

+Release:	1%{?dist}

+License:	GPLv2+

+URL:		http://sourceforge.net/projects/sshpass/

+Source0:	http://downloads.sourceforge.net/project/sshpass/sshpass/1.05/sshpass-1.05.tar.gz

+%define sha1 sshpass=6dafec86dd74315913417829542f4023545c8fd7

+Group:		Applications/Networking

+Vendor:		VMware, Inc.

+Distribution:	Photon

+%description

+sshpass is a utility designed for running ssh using the mode referred to as "keyboard-interactive" password authentication, but in non-interactive mode. 

+%prep

+%setup -q

+%build

+./configure --prefix=%{_prefix} 

+make %{?_smp_mflags}

+%install

+rm -rf %{buildroot}

+make prefix=%{_prefix}	DESTDIR=%{buildroot} install

+

+%check

+make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

+

+%clean 

+rm -rf %{buildroot}/*

+

+%files

+%defattr(-,root,root)

+%doc AUTHORS ChangeLog NEWS

+%{_bindir}

+%{_mandir}/man1

+

+%changelog

+*	Fri Sep 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.05-1

+-	Initial version

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

 Summary:	Highly reliable distributed coordination

 Name:		zookeeper

 Version:	3.4.6

-Release:	2%{?dist}

+Release:	3%{?dist}

 URL:		http://zookeeper.apache.org/

 License:	Apache License, Version 2.0

 Group:		Applications/System

@@ -9,7 +9,8 @@ Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source:	http://www.carfab.com/apachesoftware/zookeeper/stable/%{name}-%{version}.tar.gz

 %define sha1 zookeeper=2a9e53f5990dfe0965834a525fbcad226bf93474

-Requires: shadow, openjdk

+Requires: shadow

+Requires: openjre

 Provides: zookeeper

 %description

 ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services. All of these kinds of services are used in some form or another by distributed applications. Each time they are implemented there is a lot of work that goes into fixing the bugs and race conditions that are inevitable. Because of the difficulty of implementing these kinds of services, applications initially usually skimp on them ,which make them brittle in the presence of change and difficult to manage. Even when done correctly, different implementations of these services lead to management complexity when the applications are deployed.

@@ -46,7 +47,7 @@ rm -rf %{buildroot}/%{name}-%{version}

 %pre

 getent group hadoop 2>/dev/null >/dev/null || /usr/sbin/groupadd -r hadoop

-/usr/sbin/useradd --comment "ZooKeeper" --shell /bin/bash -M -r --groups hadoop --home %{_share_dir} zookeeper 2> /dev/null || :

+/usr/sbin/useradd --comment "ZooKeeper" --shell /bin/bash -M -r --groups hadoop --home %{_prefix}/share/zookeeper zookeeper

 %post

 bash %{_prefix}/sbin/update-zookeeper-env.sh \

@@ -55,7 +56,7 @@ bash %{_prefix}/sbin/update-zookeeper-env.sh \

        --log-dir=%{_var}/log/zookeeper \

        --pid-dir=%{_var}/run \

        --var-dir=%{_var}/zookeeper

--p /sbin/ldconfig

+/sbin/ldconfig

 %preun

 bash %{_prefix}/sbin/update-zookeeper-env.sh \

@@ -67,6 +68,8 @@ bash %{_prefix}/sbin/update-zookeeper-env.sh \

        --uninstall

 %postun	-p /sbin/ldconfig

+/usr/sbin/userdel zookeeper

+

 %files

 %defattr(-,root,root)

 %attr(0755,root,hadoop) %{_var}/log/zookeeper

@@ -77,8 +80,9 @@ bash %{_prefix}/sbin/update-zookeeper-env.sh \

 %{_prefix}

 %changelog

-

+* 	Wed Sep 16 2015 Harish Udaiya Kumar<hudaiyakumar@vmware.com> 3.4.6-3

+-	Udating the dependency after repackaging the openjdk, fixed post scripts

 *	Wed Aug 05 2015 Kumar Kaushik <kaushikk@vmware.com> 3.4.6-2

         Adding ldconfig in post section.

-*       Thu Jun 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.4.6-1

+*   Thu Jun 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.4.6-1

         Initial build. First version	Initial build. First version

@@ -27,7 +27,7 @@

                 "nss-altfiles", "apache-maven", "subversion", "mesos", "python3", "python3-libs", "python3-devel", "python3-tools", "fakeroot-ng", "ctags",

                 "libtirpc", "libtirpc-devel", "lsof", "nfs-utils", "cve-check-tool", "flannel", "rpm-build", "dkms", "openssl-perl", "xinetd", "tftp", "tftp-server",

                 "audit","audit-devel","libcap-ng","libcap-ng-devel","tcp_wrappers","tcp_wrappers-devel", "apr-util-devel", "apr-util-ldap", 

-                "apr-util-pgsql", "apr-util-sqlite"]

+                "apr-util-pgsql", "apr-util-sqlite","openjre", "sshpass", "openjdk-src", "openjdk-sample", "openjdk-doc"]

 }

@@ -65,6 +65,7 @@ class SerializedSpecObjects(object):

 			if (allDeps.has_key(depPkg) and allDeps[depPkg] < level + 1): 

 				allDeps[depPkg] = level + 1

 				parent[depPkg] = inPkg

+				self.updateLevels(allDeps, depPkg, parent, allDeps[depPkg])

 	def readSpecsAndConvertToSerializableObjects(self, specFilesPath, inputType, inputValue, displayOption):

 		children = {}