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

 Summary:	Apache Ant

 Name:		apache-ant

 Version:	1.10.1

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	Apache

 URL:		http://ant.apache.org

 Group:		Applications/System

@@ -44,7 +44,7 @@ mkdir -p -m 700 %{buildroot}/var/opt

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

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

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

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

@@ -57,7 +57,10 @@ chmod 644 $MAVEN_ANT_TASKS_DIR/*

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

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

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

@@ -67,8 +70,10 @@ echo 'export ANT_HOME=/var/opt/%{name}-%{version}' > %{buildroot}/etc/profile.d/

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

 %changelog

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

--	Renamed openjdk to openjdk8

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

+-   Renamed openjdk to openjdk8

 *   Mon Apr 17 2017 Chang Lee <changlee@vmware.com> 1.10.1-1

 -   Updated Apache Ant to 1.10.1

 *   Fri Mar 31 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-6

@@ -77,8 +82,8 @@ echo 'export ANT_HOME=/var/opt/%{name}-%{version}' > %{buildroot}/etc/profile.d/

 -   Updated JAVA_HOME path to point to latest JDK.

 *   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-4

 -   Updated JAVA_HOME path to point to latest JDK.

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-3

--	GA - Bump release of all rpms

+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-3

+-   GA - Bump release of all rpms

 *   Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 1.9.6-2

 -   Updated JAVA_HOME path to point to latest JDK.

 *   Tue Feb 29 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-1

new file mode 100644

@@ -0,0 +1,30 @@

+--- a/build.xml	2017-01-31 08:17:48.000000000 -0800

+@@ -414,11 +414,11 @@

+           <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>

+           <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>

+ 

++          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="test"/>

+           <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"/>

+           <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"/>

+           <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/>

+ 

+-

+           <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.13"/>

+           <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.13"/>

+ 

+@@ -539,9 +539,10 @@

+                 version="${version}"/>

+         <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>

+         <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" />

+-        <dependency groupId="org.jboss.byteman" artifactId="byteman"/>

+-        <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"/>

+-        <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"/>

++        <dependency groupId="org.jboss.byteman" artifactId="byteman-install" scope="test"/>

++        <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/>

++        <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/>

++        <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/>

+       </artifact:pom>

+ 

+       <artifact:pom id="test-deps-pom"

+

new file mode 100644

@@ -0,0 +1,19 @@

+[Unit]

+Description=Apache Cassandra

+After=network.target

+

+[Service]

+EnvironmentFile=/etc/sysconfig/cassandra

+Type=forking

+PIDFile=/var/run/cassandra.pid

+ExecStart=/usr/sbin/cassandra -f -p /var/run/cassandra.pid

+User=cassandra

+Group=cassandra

+StandardError=journal

+StandardOutput=journal

+Restart=always

+RestartSec=30

+LimitNOFILE=infinity

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,122 @@

+#%global debug_package %{nil}

+%global __os_install_post %{nil}

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

+Name:           cassandra

+Version:        3.10

+Release:        1%{?dist}

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

+License:        Apache License, Version 2.0

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        https://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/3.10/apache-%{name}-%{version}-src.tar.gz

+%define sha1 apache-cassandra=fa2bbeb62f930f5ff6fccee60cfb837d0794633a

+Source1:		cassandra.service

+Patch0:			build-fix.patch

+BuildRequires:  apache-ant

+BuildRequires:	unzip zip

+BuildRequires:	openjdk8 >= %{JAVA8_VERSION}

+Requires:       openjre8 >= %{JAVA8_VERSION}

+%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.

+

+%prep

+%setup -qn apache-%{name}-%{version}-src

+%patch0 -p1

+

+%build

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

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

+ant jar javadoc -Drelease=true

+

+%install

+mkdir -p %{buildroot}/var/opt/%{name}/data

+mkdir -p %{buildroot}/var/log/%{name}

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

+mkdir -p %{buildroot}%{_sbindir}

+mkdir -p %{buildroot}%{_datadir}/cassandra

+mkdir -p %{buildroot}%{_sysconfdir}/cassandra

+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig

+mkdir -p %{buildroot}/etc/profile.d

+mkdir -p %{buildroot}/var/opt/cassandra

+

+cp bin/%{name} %{buildroot}%{_sbindir}

+cp bin/%{name}.in.sh %{buildroot}%{_datadir}/cassandra/

+cp bin/nodetool %{buildroot}%{_bindir}/

+cp bin/sstableloader %{buildroot}%{_bindir}/

+cp bin/sstablescrub %{buildroot}%{_bindir}/

+cp bin/sstableupgrade %{buildroot}%{_bindir}/

+cp bin/sstableutil %{buildroot}%{_bindir}/

+cp bin/sstableverify %{buildroot}%{_bindir}/

+cp bin/cqlsh %{buildroot}%{_bindir}/

+cp bin/cqlsh.py %{buildroot}%{_bindir}/

+cp conf/cassandra-env.sh %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/cassandra.yaml %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/cassandra-jaas.config %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/cassandra-topology.properties %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/jvm.options %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/logback-tools.xml %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/logback.xml %{buildroot}%{_sysconfdir}/cassandra/

+cp conf/metrics-reporter-config-sample.yaml %{buildroot}%{_sysconfdir}/cassandra/

+cp -r lib %{buildroot}/var/opt/cassandra/

+cp -r build %{buildroot}/var/opt/cassandra/

+cp tools/bin/cassandra-stress %{buildroot}%{_bindir}

+cp tools/bin/cassandra-stressd %{buildroot}%{_bindir}

+cp tools/bin/sstabledump %{buildroot}%{_bindir}/

+cp tools/bin/sstableexpiredblockers %{buildroot}%{_bindir}/sstableexpiredblockers

+cp tools/bin/sstablelevelreset %{buildroot}%{_bindir}/sstablelevelreset

+cp tools/bin/sstablemetadata %{buildroot}%{_bindir}/sstablemetadata

+cp tools/bin/sstableofflinerelevel %{buildroot}%{_bindir}/sstableofflinerelevel

+cp tools/bin/sstablerepairedset %{buildroot}%{_bindir}/sstablerepairedset

+cp tools/bin/sstablesplit %{buildroot}%{_bindir}/sstablesplit

+cp tools/bin/cassandra-stress %{buildroot}%{_bindir}/

+cp tools/bin/cassandra-stressd %{buildroot}%{_bindir}/

+

+

+

+mkdir -p %{buildroot}/lib/systemd/system

+install -p -D -m 644 %{SOURCE1}  %{buildroot}/lib/systemd/system/%{name}.service

+

+cat >> %{buildroot}/etc/sysconfig/cassandra <<- "EOF"

+CASSANDRA_HOME=/var/opt/cassandra/

+CASSANDRA_CONF=%{_sysconfdir}/cassandra/

+EOF

+

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

+export CASSANDRA_HOME=/var/opt/cassandra/

+export CASSANDRA_CONF=%{_sysconfdir}/cassandra/

+EOF

+

+%pre

+getent group cassandra >/dev/null || /usr/sbin/groupadd -r cassandra

+getent passwd cassandra >/dev/null || /usr/sbin/useradd --comment "Cassandra" --shell /bin/bash -M -r --groups cassandra --home /var/opt/%{name}/data cassandra

+

+%post

+%{_sbindir}/ldconfig

+chown -R cassandra: /var/opt/cassandra

+source /etc/profile.d/cassandra.sh

+%systemd_post cassandra.service

+

+%postun

+%systemd_postun_with_restart cassandra.service

+if [ $1 -eq 0 ] ; then

+    /usr/sbin/userdel cassandra

+    /usr/sbin/groupdel cassandra

+fi

+/sbin/ldconfig

+

+%files

+%defattr(-,root,root)

+%doc README.asc CHANGES.txt NEWS.txt conf/cqlshrc.sample LICENSE.txt NOTICE.txt

+%{_bindir}/*

+%{_datadir}/cassandra

+/var/opt/cassandra

+%{_sbindir}

+%{_sysconfdir}/cassandra

+%{_sysconfdir}/sysconfig/cassandra

+/etc/profile.d/cassandra.sh

+/lib/systemd/system/cassandra.service

+

+%changelog

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

+-   Initial build. First version

@@ -369,7 +369,7 @@ class SpecParser(object):

             print "Error: Can not find match for sha1 "+value[0]

             return False

         if (len(matchedSources) > 1):

-            print "Error: Too many matches in sources: "+matchedSources+" for sha1 "+value[0]

+            print "Error: Too many matched Sources:" + ' '.join(matchedSources) + " for sha1 "+value[0]

             return False

         pkg.checksums[sourceName] = value[1]

         return True;