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

 Summary:	Apache Maven

 Name:		apache-maven

 Version:	3.3.3

-Release:	0

+Release:	1%{?dist}

 License:	Apache

 URL:		http://maven.apache.org

 Group:		Applications/System

@@ -23,8 +23,7 @@ The Maven package contains binaries for a build system

 %prep

 %setup -q

-echo "nameserver 127.0.1.1" > /etc/resolv.conf

-echo "search localdomain" >> /etc/resolv.conf

+

 %build

 MAVEN_DIST_DIR=/opt/apache-maven-3.3.3

@@ -40,12 +39,19 @@ ant -Dmaven.home=$MAVEN_DIST_DIR

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

-cp -r /opt/apache-maven-3.3.3 %{buildroot}/opt

+cp -r /opt/apache-maven-3.3.3  %{buildroot}/opt

+

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

+

+echo 'export MAVEN_HOME=/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

 %files

 %defattr(-,root,root)

 %{_bindir}/*

 %{_libdir}/*

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

 %{_prefix}/LICENSE

 %{_prefix}/NOTICE

 %{_prefix}/README.txt

@@ -55,5 +61,7 @@ cp -r /opt/apache-maven-3.3.3 %{buildroot}/opt

 %{_prefix}/conf/toolchains.xml

 %changelog

+*	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

 -	Initial build.	First version

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

 Distribution: Photon

 Source0:    http://archive.apache.org/dist/apr/%{name}-%{version}.tar.gz

 %define sha1 apr-util=72cc3ac693b52fb831063d5c0de18723bc8e0095

+%define     apuver    1

+

 BuildRequires:   apr

 BuildRequires:   openldap

 BuildRequires:   openssl

@@ -25,7 +27,7 @@ The Apache Portable Runtime Utility Library.

 %setup -q

 %build

 %configure --with-apr=%{_prefix} \

-        --includedir=%{_includedir}/apr-%{version} \

+        --includedir=%{_includedir}/apr-%{apuver} \

         --with-ldap --without-gdbm \

         --with-sqlite3 --with-pgsql \

         --without-sqlite2 \

@@ -54,9 +56,11 @@ rm -rf $RPM_BUILD_ROOT

 %{_includedir}/*

 %changelog

+*   Wed Jul 15 2015 Sarah Choi <sarahc@vmware.com> 1.5.4-4

+-   Use apuver(=1) instead of version for mesos 

 *   Mon Jul 13 2015 Alexey Makhalov <amakhalov@vmware.com> 1.5.2-3

 -   Exclude /usr/lib/debug

 *   Wed Jul 01 2015 Touseef Liaqat <tliaqat@vmware.com> 1.5.2-2

 -   Fix tags and paths.

-*   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 1.5.2-1

+*   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 1.5.4-1

 -   Initial build. First version

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

 Summary:    The Apache Portable Runtime

 Name:       apr

 Version:    1.5.2

-Release:    3%{?dist}

+Release:    4%{?dist}

 License:    Apache License 2.0

 URL:        https://apr.apache.org/

 Group:      System Environment/Libraries

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

 Distribution: Photon

 Source0:    http://archive.apache.org/dist/apr/%{name}-%{version}.tar.gz

 %define sha1 apr=2ef2ac9a8de7f97f15ef32cddf1ed7325163d84c

+%define	    aprver  1

 %description

 The Apache Portable Runtime.

@@ -16,8 +17,8 @@ The Apache Portable Runtime.

 %setup -q

 %build

 ./configure --prefix=/usr \

-        --includedir=%{_includedir}/apr-%{version} \

-        --with-installbuilddir=%{_libdir}/apr/build-%{version} \

+        --includedir=%{_includedir}/apr-%{aprver} \

+        --with-installbuilddir=%{_libdir}/apr/build-%{aprver} \

         --with-devrandom=/dev/urandom \

         CC=gcc CXX=g++

@@ -36,6 +37,8 @@ make DESTDIR=%{buildroot} install

 %{_includedir}/*

 %changelog

+*   Wed Jul 15 2015 Sarah Choi <sarahc@vmware.com> 1.5.2-4

+-   Use aprver(=1) instead of version for mesos

 *   Mon Jul 13 2015 Alexey Makhalov <amakhalov@vmware.com> 1.5.2-3

 -   Exclude /usr/lib/debug

 *   Wed Jul 01 2015 Touseef Liaqat <tliaqat@vmware.com> 1.5.2-2

new file mode 100644

@@ -0,0 +1,55 @@

+Summary:	Mesos

+Name:		mesos

+Version:	0.22.1

+Release:	1%{?dist}

+License:	Apache

+URL:		http://mesos.apache.org

+Group:		Applications/System

+Vendor:		VMware, Inc.

+Distribution: 	Photon

+Source0:	http://apache.mirrors.lucidnetworks.net/mesos/%{name}-%{version}.tar.gz

+Requires:	openjdk >= 1.8.0.45

+Requires:	expat

+BuildRequires:	openjdk >= 1.8.0.45

+BuildRequires:	curl

+BuildRequires:	apache-maven >= 3.3.3

+BuildRequires:	apr >= 1.5.2

+BuildRequires:	apr-util >= 1.5.4

+BuildRequires:	subversion >= 1.8.13

+BuildRequires:	cyrus-sasl >= 2.1.26

+BuildRequires:	python2 >= 2.6

+BuildRequires:	python2-libs

+BuildRequires:	python2-devel

+

+%description

+The Mesos package installs MesosContainerizer.

+

+%prep

+

+%setup -q

+%build

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

+

+make %{?_smp_mflags}

+

+%check

+make check

+

+%install

+make DESTDIR=%{buildroot} install

+

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

+

+%files

+%defattr(-,root,root)

+%{_bindir}/*

+%{_libdir}/*

+%{_includedir}/*/*

+%{_sbindir}/*

+%{_prefix}/etc/mesos/*

+%{_libexecdir}/mesos/*

+%{_datadir}/mesos/*

+

+%changelog

+*	Fri Jun 26 2015 Sarah Choi <sarahc@vmware.com> 0.22.1-1

+-	Initial build.	First version

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

 Summary:	OpenJDK 

 Name:		openjdk

 Version:	1.8.0.45

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GNU GPL

 URL:		https://openjdk.java.net

 Group:		Development/Tools

@@ -27,7 +27,7 @@ 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.45-bin/bin"

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

 EOF

 %clean

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

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

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

 %changelog

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

+-	Add JRE path 

 *	Mon May 18 2015 Sharath George <sharathg@vmware.com> 1.8.0.45-1

 -	Initial build.	First version

new file mode 100644

@@ -0,0 +1,55 @@

+Summary:    	The Apache Subversion control system

+Name:       	subversion

+Version:    	1.8.13

+Release:    	1%{?dist}

+License:    	Apache License 2.0

+URL:        	http://subversion.apache.org/

+Group:      	Utilities/System

+Vendor:     	VMware, Inc.

+Distribution: 	Photon

+Source0:        http://archive.apache.org/dist/subversion/%{name}-%{version}.tar.gz

+Requires:   	apr

+Requires:   	apr-util

+BuildRequires: 	apr

+BuildRequires: 	apr-util

+BuildRequires: 	sqlite-autoconf

+BuildRequires: 	libtool

+BuildRequires: 	expat

+

+%description

+The Apache version control system.

+

+%prep

+%setup -q

+%build

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

+	    --disable-static				\

+	    --with-apache-libexecdir 

+

+make %{?_smp_mflags}

+

+%install

+make -j1 DESTDIR=%{buildroot} install 

+

+%files

+%defattr(-,root,root)

+%{_bindir}/*

+%{_libdir}/*

+%{_includedir}/*

+%{_mandir}/*/*

+%lang(de) %{_datadir}/locale/de/LC_MESSAGES/subversion.mo

+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/subversion.mo

+%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/subversion.mo

+%lang(it) %{_datadir}/locale/it/LC_MESSAGES/subversion.mo

+%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/subversion.mo

+%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/subversion.mo

+%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/subversion.mo

+%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/subversion.mo

+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/subversion.mo

+%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/subversion.mo

+%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/subversion.mo

+%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/subversion.mo

+

+%changelog

+*   Fri Jun 26 2015 Sarah Choi <sarahc@vmware.com> 1.8.13-1

+-   Initial build. First version

@@ -24,7 +24,7 @@

                 "rpm-devel","pycurl","urlgrabber","yum-metadata-parser","yum", "rocket", "strace", "cracklib-python",

                 "haveged", "haveged-devel", "vim-extra",

                 "postgresql", "openjdk", "apr", "apr-util", "httpd", "openvswitch", "eventlog", "syslog-ng", "zookeeper", "fuse", "fleet",

-                "nss-altfiles"]

+                "nss-altfiles", "apache-maven", "subversion", "mesos"]

 }

@@ -159,6 +159,7 @@ make-4.0.tar.bz2 - c819622dc84e2290c351646b8a0ec4df0df12bb6

 man-db-2.6.6.tar.xz - ba27924ef024527ad562017d956ffd3375bccc8d

 man-pages-3.59.tar.xz - 76eae3fb069a6df2195081408e7ea2784722385b

 mercurial-3.1.2.tar.gz - ae7e16454cee505da895c2497f09711f35287459

+mesos-0.22.1.tar.gz - 599c09d83ee69804cd12936c8c3df57f45f30b4d

 mkinitcpio-18.tar.gz - 0e124990118d170f6852efe46d889b5adae6dfd6

 Module-Install-1.14.tar.gz - 255bff1bdf9e7b0f67eff15d0b4d52662c0f67d7

 Module-ScanDeps-1.18.tar.gz - f12767be803f28e685be29e6bc9430361179de09

@@ -212,6 +213,7 @@ shadow_4.1.5.1.orig.tar.gz - 6e4de75de58405d21b0377b926ae770afccd95bc

 six-1.9.0.tar.gz - d168e6d01f0900875c6ecebc97da72d0fda31129

 sqlite-autoconf-3080301.tar.gz - a9b0a3d66fb5c2ae51ad2d8a512ca827adc7d59c

 strace-4.10.tar.xz - 5c3ec4c5a9eeb440d7ec70514923c2e7e7f9ab6c

+subversion-1.8.13.tar.gz - 437cf662b7ed27d2254aa7ca334fdd74b49262ef

 sudo-1.8.11p1.tar.gz - 3c442d59c0e112d4a43ffba434580e93fe1a766f

 swig-3.0.5.tar.gz - 271813b317e4836853d2249fc8ce2df34c2a062a

 syslog-ng_3.6.2.tar.gz - 36eeaf920383ee8cb1c17d945205b7562f9fbbb2