1. photon
  2. Commit 4b28ebc6084941e6c00d4787dc3a93d07d998a61
Browse code

Use java alternatives and remove java version macros

Change-Id: I3000db3de1045d08c860a98141217de1b603244e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2792
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

harishspqr authored on 2017/05/23 04:02:13
Showing 12 changed files
SPECS/ant-contrib/ant-contrib.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Ant contrib
2 2 
 Name:		ant-contrib
3 3 
 Version:	1.0b3
4 
-Release:	11%{?dist}
4 
+Release:	12%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://ant-contrib.sourceforget.net
7 7 
 Group:		Applications/System
... ... 
@@ -10,11 +10,10 @@ Distribution: 	Photon
10 10 
 BuildArch:      noarch
11 11 
 Source0:	http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}-src.tar.gz
12 12 
 %define sha1 ant-contrib=b28d2bf18656b263611187fa9fbb95cec93d47c8
13 
-%define java_macros_version 1.8.0.131-1%{?dist}
14 
-BuildRequires: openjre >= %{java_macros_version}
15 
-BuildRequires: openjdk >= %{java_macros_version}
13 
+BuildRequires: openjre >= %{JAVA_VERSION}
14 
+BuildRequires: openjdk >= %{JAVA_VERSION}
16 15 
 BuildRequires: apache-ant >= 1.9.6
17 
-Requires: openjre >= %{java_macros_version}
16 
+Requires: openjre >= %{JAVA_VERSION}
18 17 
 Requires: apache-ant >= 1.9.6
19 18 
 %define _prefix /var/opt/ant-contrib
20 19
... ... 
@@ -26,9 +25,9 @@ The Ant Contrib project is a collection of tasks for Apache Ant.
26 26 
 find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
27 27
28 28 
 %build
29 
-export ANT_HOME=%{_ant_home}
30 
-export JAVA_HOME=%{_java_home}
29 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
31 30 
 mkdir -p -m 700 %{_prefix}
31 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
32 32 
 $ANT_HOME/bin/ant -Ddist.dir="%{_prefix}" -Dproject.version="1.0b3" dist
33 33 
 %install
34 34 
 ANT_HOME=/var/opt/apache-ant-1.9.6
... ... 
@@ -36,22 +35,26 @@ ANT_CONTRIB_DIST_DIR=%{buildroot}%{name}-%{version}
36 36 
 [ %{buildroot} != "/" ] && rm -rf %{buildroot}/*
37 37 
 mkdir -p -m 700 %{buildroot}/var/opt
38 38 
 cd %{buildroot}/var/opt && tar xvzf %{_prefix}/ant-contrib-1.0b3-bin.tar.gz --wildcards "*.jar"
39 
+
39 40 
 %files
40 41 
 %defattr(-,root,root)
42 
+%dir %{_prefix}
41 43 
 %{_prefix}/*.jar
42 44 
 %{_prefix}/lib/*.jar
43 45
44 46 
 %changelog
45 
-*	Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0b3-11
46 
--	Use java_macros to determine the version on updating java to 1.8.0.131
47 
+*   Fri May 19 2017 Harish Udiaya Kumar <hudaiyakumar@vmware.com> 1.0b3-12
48 
+-   Use java alternatives
49 
+*   Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0b3-11
50 
+-   Use java_macros to determine the version on updating java to 1.8.0.131
47 51 
 *   Fri Apr 07 2017 Divya Thaluru <dthaluru@vmware.com> 1.0b3-10
48 52 
 -   Removed prebuilt binaries from source tar ball
49 53 
 *   Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0b3-9
50 54 
 -   Updated JAVA_HOME path to point to latest.
51 55 
 *   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0b3-8
52 56 
 -   Updated JAVA_HOME path to point to latest.
53 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0b3-7
54 
--	GA - Bump release of all rpms
57 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0b3-7
58 
+-   GA - Bump release of all rpms
55 59 
 *   Fri May 20 2016 Divya Thaluru<dthaluru@vmware.com> 1.0b3-6
56 60 
 -   Updated JAVA_HOME path to point to latest.
57 61 
 *   Wed Mar 02 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0b3.0-5
SPECS/apache-ant/apache-ant.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Ant
2 2 
 Name:		apache-ant
3 3 
 Version:	1.9.6
4 
-Release:	6%{?dist}
4 
+Release:	7%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://ant.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -14,10 +14,9 @@ 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 
-%define java_macros_version 1.8.0.131-1%{?dist}
18 
-Requires: openjre >= %{java_macros_version}, python2
19 
-BuildRequires: openjre >= %{java_macros_version}
20 
-BuildRequires: openjdk >= %{java_macros_version}
17 
+Requires: openjre >= %{JAVA_VERSION}, python2
18 
+BuildRequires: openjre >= %{JAVA_VERSION}
19 
+BuildRequires: openjdk >= %{JAVA_VERSION}
21 20 
 %define _prefix /var/opt/apache-ant-%{version}
22 21 
 %define _bindir %{_prefix}/bin
23 22 
 %define _libdir %{_prefix}/lib
... ... 
@@ -36,9 +35,7 @@ ANT_DIST_DIR=/var/opt/apache-ant-%{version}
36 36 
 cp -v ./hamcrest-1.3/hamcrest-core-1.3.jar ./lib/optional
37 37
38 38 
 mkdir -p -m 700 $ANT_DIST_DIR
39 
-
40 
-export JAVA_HOME=%{_java_home}
41 
-
39 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
42 40 
 ./bootstrap.sh && ./build.sh -Ddist.dir=$ANT_DIST_DIR
43 41
44 42 
 %install
... ... 
@@ -65,12 +62,15 @@ echo 'export ANT_HOME=/var/opt/%{name}-%{version}' > %{buildroot}/etc/profile.d/
65 65
66 66 
 %files
67 67 
 %defattr(-,root,root)
68 
+%dir %{_prefix}
68 69 
 %{_bindir}/*
69 70 
 %{_libdir}/*
70 71 
 %{_prefix}/maven-ant-tasks/*
71 72 
 %{_sysconfdir}/profile.d/%{name}.sh
72 73
73 74 
 %changelog
75 
+*   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-7
76 
+-   Use Java alternatives
74 77 
 *	Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.9.6-6
75 78 
 -	Update java to 1.8.0.131 & use java macros to update version
76 79 
 *   Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.9.6-5
SPECS/apache-maven/apache-maven.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Maven
2 2 
 Name:		apache-maven
3 3 
 Version:	3.3.9
4 
-Release:	8%{?dist}
4 
+Release:	9%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://maven.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -10,10 +10,9 @@ Distribution: 	Photon
10 10 
 BuildArch:       noarch
11 11 
 Source0:	http://apache.mirrors.lucidnetworks.net//maven/source/%{name}-%{version}-src.tar.gz
12 12 
 %define sha1 apache-maven=1912316078f1f7041dd8cd2580f210d30f898162
13 
-%define java_macros_version 1.8.0.131-1%{?dist}
14 
-Requires: openjre >= %{java_macros_version}
15 
-BuildRequires: openjre >= %{java_macros_version}
16 
-BuildRequires: openjdk >= %{java_macros_version}
13 
+Requires: openjre >= %{JAVA_VERSION}
14 
+BuildRequires: openjre >= %{JAVA_VERSION}
15 
+BuildRequires: openjdk >= %{JAVA_VERSION}
17 16 
 BuildRequires: apache-ant >= 1.9.6
18 17 
 BuildRequires: wget >= 1.15
19 18
... ... 
@@ -32,8 +31,8 @@ find . -name build.xml | xargs sed -i 's/timeout="600000"/timeout="1200000"/g'
32 32 
 %build
33 33 
 MAVEN_DIST_DIR=%{_prefix}
34 34
35 
-export JAVA_HOME=%{_java_home}
36 
-export ANT_HOME=%{_ant_home}
35 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
36 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
37 37 
 export PATH=$PATH:$ANT_HOME/bin
38 38
39 39 
 sed -i 's/www.opensource/opensource/g' DEPENDENCIES
... ... 
@@ -55,6 +54,7 @@ echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh
55 55
56 56 
 %files
57 57 
 %defattr(-,root,root)
58 
+%dir %{_prefix}
58 59 
 %{_bindir}/*
59 60 
 %{_libdir}/*
60 61 
 %{_sysconfdir}/profile.d/%{name}.sh
... ... 
@@ -67,8 +67,10 @@ echo 'export MAVEN_OPTS=-Xms256m' >> %{buildroot}/etc/profile.d/%{name}.sh
67 67 
 %{_prefix}/conf/toolchains.xml
68 68
69 69 
 %changelog
70 
-*	Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.9-8
71 
--	Update java to 1.8.0.131 & use java macros to update version
70 
+*   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.9-9
71 
+-   Remove macros and use java alternatives
72 
+*   Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3.9-8
73 
+-   Update java to 1.8.0.131 & use java macros to update version
72 74 
 *   Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.3.9-7
73 75 
 -   Updated JAVA_HOME path to point to latest JDK.
74 76 
 *   Thu Oct 27 2016 Alexey Makhalov <amakhalov@vmware.com> 3.3.9-6
SPECS/apache-tomcat/apache-tomcat.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Tomcat
2 2 
 Name:		apache-tomcat
3 3 
 Version:	8.5.13
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://tomcat.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -10,11 +10,10 @@ Distribution: 	Photon
10 10 
 BuildArch:      noarch
11 11 
 Source0:    http://apache.mirrors.ionfish.org/tomcat/tomcat-8/v%{version}/src/%{name}-%{version}-src.tar.gz
12 12 
 %define sha1 apache-tomcat=a2097a08b023c363098917078d9a23bd7a3b6032
13 
-%define java_macros_version 1.8.0.131-1%{?dist}
14 
-BuildRequires: openjre >= %{java_macros_version}
15 
-BuildRequires: openjdk >= %{java_macros_version}
13 
+BuildRequires: openjre >= %{JAVA_VERSION}
14 
+BuildRequires: openjdk >= %{JAVA_VERSION}
16 15 
 BuildRequires: apache-ant >= 1.9.6
17 
-Requires: openjre >= %{java_macros_version}
16 
+Requires: openjre >= %{JAVA_VERSION}
18 17 
 Requires: apache-ant >= 1.9.6
19 18
20 19 
 %define _prefix /var/opt/%{name}-%{version}
... ... 
@@ -33,8 +32,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
33 33 
    -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
34 34
35 35 
 %build
36 
-export ANT_HOME=%{_ant_home}
37 
-export JAVA_HOME=%{_java_home}
36 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
38 37 
 mkdir -p -m 700 %{_prefix}
39 38 
 $ANT_HOME/bin/ant -Dbase.path="." deploy dist-prepare dist-source javadoc
40 39
... ... 
@@ -73,8 +71,10 @@ rm -rf %{buildroot}/*
73 73 
 %{_webappsdir}/*
74 74
75 75 
 %changelog
76 
-*	Tue May 02 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 8.5.13-3
77 
--	Updated openjdk to version 1.8.0.131 & used java macros to update version.
76 
+*   Tue May 02 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 8.5.13-4
77 
+-   Use java alternatives.
78 
+*   Tue May 02 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 8.5.13-3
79 
+-   Updated openjdk to version 1.8.0.131 & used java macros to update version.
78 80 
 *   Tue Apr 18 2017 Divya Thaluru <dthaluru@vmware.com> 8.5.13-2
79 81 
 -   Added logic to package directories
80 82 
 *   Mon Apr 10 2017 Divya Thaluru <dthaluru@vmware.com> 8.5.13-1
SPECS/commons-daemon/commons-daemon.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Apache Commons Daemon
2 2 
 Name:		commons-daemon
3 3 
 Version:	1.0.15
4 
-Release:	9%{?dist}
4 
+Release:	10%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://commons.apache.org/proper/commons-daemon
7 7 
 Group:		Applications/System
... ... 
@@ -10,10 +10,9 @@ Distribution: 	Photon
10 10 
 BuildArch:      x86_64
11 11 
 Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
12 12 
 %define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3
13 
-%define java_macros_version 1.8.0.131-1%{?dist}
14 
-Requires: openjre >= %{java_macros_version}
15 
-BuildRequires: openjre >= %{java_macros_version}
16 
-BuildRequires: openjdk >= %{java_macros_version}
13 
+Requires: openjre >= %{JAVA_VERSION}
14 
+BuildRequires: openjre >= %{JAVA_VERSION}
15 
+BuildRequires: openjdk >= %{JAVA_VERSION}
17 16 
 BuildRequires: apache-ant >= 1.9.6
18 17
19 18 
 %define _prefix /var/opt/%{name}-%{version}
... ... 
@@ -26,9 +25,8 @@ The JNA package contains libraries for interop from Java to native libraries.
26 26
27 27 
 %setup -q -n %{name}-%{version}-src
28 28 
 %build
29 
-ANT_HOME=%{_ant_home}
30 
-export JAVA_HOME=%{_java_home}
31 
-
29 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
30 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
32 31 
 $ANT_HOME/bin/ant dist
33 32
34 33 
 export CFLAGS=-m64
... ... 
@@ -41,8 +39,8 @@ cd src/native/unix && ./configure && make
41 41 
 cd $CURDIR
42 42
43 43 
 %install
44 
-
45 
-ANT_HOME=%{_ant_home}
44 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
45 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
46 46 
 DIST_DIR=%{buildroot}%{_prefix}
47 47
48 48 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
... ... 
@@ -57,10 +55,13 @@ chmod -R 755 $DIST_DIR
57 57
58 58 
 %files
59 59 
 %defattr(-,root,root)
60 
+%dir %{_prefix}
60 61 
 %{_bindir}/jsvc
61 62 
 %{_prefix}/*.jar
62 63
63 64 
 %changelog
65 
+*   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0.15-10
66 
+-   Use java alternatives and remove macros
64 67 
 *	Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.0.15-9
65 68 
 -	Update java to 1.8.0.131 & use java macros to update version
66 69 
 *   Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.15-8
SPECS/jaxws-ri/jaxws-ri.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Jax WS Reference Implementation
2 2 
 Name:		jaxws-ri
3 3 
 Version:	2.2.10
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	CDDL-1.0, GPLv2
6 6 
 URL:		http://jax-ws.java.net/%{version}
7 7 
 Group:		Applications/System
... ... 
@@ -10,7 +10,7 @@ Distribution: 	Photon
10 10 
 BuildArch:      noarch
11 11 
 Source0:	http://jax-ws.java.net/%{version}/%{name}-%{version}.tar.gz
12 12 
 %define sha1 jaxws-ri=0f2f00cfd3783f94fa940cc8ef678d47fb748c8c
13 
-Requires: openjre >= 1.8.0.45
13 
+Requires: openjre >= %{JAVA_VERSION}
14 14
15 15 
 %define _prefix /opt/%{name}-%{version}
16 16 
 %define _bindir %{_prefix}/bin
... ... 
@@ -38,6 +38,7 @@ rm -rf %{buildroot}/*
38 38
39 39 
 %files
40 40 
 %defattr(-,root,root)
41 
+%dir %{_prefix}
41 42 
 %{_prefix}/LICENSE.txt
42 43 
 %{_prefix}/CDDL+GPLv2.txt
43 44 
 %{_prefix}/ThirdPartyLicense.txt
... ... 
@@ -47,6 +48,8 @@ rm -rf %{buildroot}/*
47 47 
 %{_libdir}/plugins/*.jar
48 48
49 49 
 %changelog
50 
+*   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.2.10-3
51 
+-   Use JAVA_VERSION macro instead of hard coded version.
50 52 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.2.10-2
51 53 
 -	GA - Bump release of all rpms
52 54 
 * 	Tue Feb 23 2016 Anish Swaminathan <anishs@vmware.com>  2.2.10-1
SPECS/jna/jna.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Java Native Access
2 2 
 Name:		jna
3 3 
 Version:	4.2.1
4 
-Release:	7%{?dist}
4 
+Release:	8%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://github.com/twall/jna
7 7 
 Group:		Applications/System
... ... 
@@ -10,10 +10,9 @@ Distribution: 	Photon
10 10 
 BuildArch:      x86_64
11 11 
 Source0:	http://dl.bintray.com/vmware/photon_release_1.0_TP1_x86_64/%{name}-%{version}.tar.gz
12 12 
 %define sha1 jna=30a1132f9ca6b3222eccd380a3f4149aa7df3f59
13 
-%define java_macros_version 1.8.0.131-1%{?dist}
14 
-Requires: openjre >= %{java_macros_version}
15 
-BuildRequires: openjre >= %{java_macros_version}
16 
-BuildRequires: openjdk >= %{java_macros_version}
13 
+Requires: openjre >= %{JAVA_VERSION}
14 
+BuildRequires: openjre >= %{JAVA_VERSION}
15 
+BuildRequires: openjdk >= %{JAVA_VERSION}
17 16 
 BuildRequires: apache-ant >= 1.9.6
18 17
19 18 
 %define _prefix /var/opt/jna-4.2.1
... ... 
@@ -33,16 +32,15 @@ Sources for JNA
33 33
34 34 
 %setup -q
35 35 
 %build
36 
-ANT_HOME=%{_ant_home}
37 
-export JAVA_HOME=%{_java_home}
38 
-
36 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
37 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
39 38 
 #disabling all tests
40 39 
 $ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/*.java" -Drelease=true
41 40 
 #$ANT_HOME/bin/ant -Dcflags_extra.native=-DNO_JAWT -Dtests.exclude-patterns="**/LibraryLoadTest.java" -Drelease=true
42 41
43 42 
 %install
44 
-
45 
-ANT_HOME=%{_ant_home}
43 
+export ANT_HOME=/var/opt/apache-ant-%{ANT_VERSION}
44 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
46 45 
 JNA_DIST_DIR=%{buildroot}%{_prefix}
47 46
48 47 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
... ... 
@@ -53,6 +51,7 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true
53 53
54 54 
 %files
55 55 
 %defattr(-,root,root)
56 
+%dir %{_prefix}
56 57 
 %{_prefix}/*.jar
57 58 
 %exclude %{_prefix}/*javadoc.jar
58 59 
 %exclude %{_prefix}/*sources.jar
... ... 
@@ -68,8 +67,10 @@ $ANT_HOME/bin/ant -Ddist=$JNA_DIST_DIR dist -Drelease=true
68 68 
 %{_prefix}/*sources.jar
69 69
70 70 
 %changelog
71 
-*	Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.1-7
72 
--	Update java to 1.8.0.131 & use java macros to update version
71 
+*   Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.1-8
72 
+-   Use java alternatives and remove macros
73 
+*   Mon May 01 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 4.2.1-7
74 
+-   Update java to 1.8.0.131 & use java macros to update version
73 75 
 *   Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.1-6
74 76 
 -   Updated JAVA_HOME path to point to latest JDK.
75 77 
 *   Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.1-5
SPECS/mesos/mesos.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Mesos
2 2 
 Name:		mesos
3 3 
 Version:	0.28.2
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	Apache
6 6 
 URL:		http://mesos.apache.org
7 7 
 Group:		Applications/System
... ... 
@@ -9,8 +9,8 @@ Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 10 
 Source0:	http://www.apache.org/dist/%{name}/%{version}/%{name}-%{version}.tar.gz
11 11 
 %define sha1 mesos=a8675ef59b4c34d4337553215a5295eebf2e4265
12 
-BuildRequires:	openjre >= 1.8.0.45
13 
-BuildRequires:  openjdk >= 1.8.0.45
12 
+BuildRequires:	openjre >= %{JAVA_VERSION}
13 
+BuildRequires:  openjdk >= %{JAVA_VERSION}
14 14 
 BuildRequires:	curl
15 15 
 BuildRequires:	apache-maven >= 3.3.3
16 16 
 BuildRequires:	apr-devel >= 1.5.2
... ... 
@@ -29,6 +29,7 @@ BuildRequires:  python-setuptools
29 29 
 BuildRequires:  protobuf
30 30 
 BuildRequires:  protobuf-devel
31 31 
 BuildRequires:  protobuf-python
32 
+BuildRequires:	which
32 33 
 Requires:	apr >= 1.5.2
33 34 
 Requires:	apr-util >= 1.5.4
34 35 
 Requires:	cyrus-sasl >= 2.1.26
... ... 
@@ -56,6 +57,7 @@ Requires:	%{name} = %{version}
56 56 
 %build
57 57 
 sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/Makefile.in
58 58 
 sed -i 's/gzip -d -c $^ | tar xf -/tar --no-same-owner -xf $^/' 3rdparty/libprocess/3rdparty/Makefile.in
59 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
59 60 
 ./configure \
60 61 
 	CFLAGS="%{optflags} -Wno-deprecated-declarations"  \
61 62 
 	CXXFLAGS="%{optflags} -Wno-deprecated-declarations" \
... ... 
@@ -69,6 +71,7 @@ make
69 69 
 make check
70 70
71 71 
 %install
72 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
72 73 
 make DESTDIR=%{buildroot} install
73 74 
 find %{buildroot}%{_libdir} -name '*.la' -delete
74 75 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
... ... 
@@ -101,6 +104,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
101 101 
 %exclude %{_libdir}/debug/
102 102
103 103 
 %changelog
104 
+*	Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 0.28.2-3
105 
+-	Use JAVA_VERSION macro instead of hard coding version.
104 106 
 *	Mon Apr 24 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.28.2-2
105 107 
 -	Install protobuf build and runtime depencencies.
106 108 
 *	Fri Jun 24 2016 Xiaolin Li <xiaolinl@vmware.com> 0.28.2-1
SPECS/openjdk/macros.java
History View file @ 4b28ebc
107 109 
deleted file mode 100644
... ... 
@@ -1,9 +0,0 @@
1 
-#java rpm macros
2 
-%_java_exports        /etc/profile.d/java-exports.sh
3 
-%_java_home %( [[ -f "%{_java_exports}" ]] && echo `cat "%{_java_exports}" | grep -m1 JAVA_HOME | cut -d'=' -f2` )
4 
-#ant
5 
-%_ant_exports        /etc/profile.d/apache-ant.sh
6 
-%_ant_home %( [[ -f "%{_ant_exports}" ]] && echo `cat "%{_ant_exports}" | grep -m1 ANT_HOME | cut -d'=' -f2` )
7 
-#maven
8 
-%_maven_exports        /etc/profile.d/apache-maven.sh
9 
-%_maven_home %( [[ -f "%{_maven_exports}" ]] && echo `cat "%{_maven_exports}" | grep -m1 MAVEN_HOME | cut -d'=' -f2` )
SPECS/openjdk/openjdk.spec
History View file @ 4b28ebc
... ... 
@@ -1,17 +1,16 @@
1 
-%define _use_internal_dependency_generator 0
1 
+%define _use_internal_dependency_generator 0
2 2 
 %global security_hardening none
3 3 
 Summary:	OpenJDK
4 4 
 Name:		openjdk
5 5 
 Version:	1.8.0.131
6 
-Release:	2%{?dist}
6 
+Release:	3%{?dist}
7 7 
 License:	GNU GPL
8 8 
 URL:		https://openjdk.java.net
9 9 
 Group:		Development/Tools
10 10 
 Vendor:		VMware, Inc.
11 11 
 Distribution:   Photon
12 
-Source0:	http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK/openjdk-%{version}.tar.bz2
12 
+Source0:	http://www.java.net/download/openjdk/jdk8/promoted/b131/openjdk-%{version}.tar.bz2
13 13 
 %define sha1 openjdk=ae01c24fe5247d5aa246a60c0272ba92188a7d55
14 
-Source1:    macros.java
15 14 
 Patch0:		disable-awt-lib.patch
16 15 
 Patch1:		fix-lcms.patch
17 16 
 Patch2:		Fix-memory-leak.patch
... ... 
@@ -22,7 +21,9 @@ BuildRequires:	zip
22 22 
 BuildRequires:	unzip
23 23 
 BuildRequires:  zlib-devel
24 24 
 BuildRequires:	ca-certificates
25 
+BuildRequires:	chkconfig
25 26 
 Requires:       openjre = %{version}-%{release}
27 
+Requires:       chkconfig
26 28 
 AutoReqProv: 	no
27 29 
 %define bootstrapjdkversion 1.8.0.112
28 30 
 %description
... ... 
@@ -31,31 +32,30 @@ The OpenJDK package installs java class library and javac java compiler.
31 31 
 %package	-n openjre
32 32 
 Summary:	Java runtime environment
33 33 
 AutoReqProv: 	no
34 
+Requires:       chkconfig
34 35 
 %description	-n openjre
35 36 
 It contains the libraries files for Java runtime environment
36 
-#%global __requires_exclude ^libgif.*$
37 
-#%filter_from_requires ^libgif.*$
38 37
39 
-%package		sample
40 
-Summary:		Sample java applications.
38 
+%package	sample
39 
+Summary:	Sample java applications.
41 40 
 Group:          Development/Languages/Java
41 
+Requires:       %{name} = %{version}-%{release}
42 42 
 %description	sample
43 43 
 It contains the Sample java applications.
44 
-Requires:       %{name} = %{version}-%{release}
45 44
46 
-%package		doc
47 
-Summary:		Documentation and demo applications for openjdk
45 
+%package	doc
46 
+Summary:	Documentation and demo applications for openjdk
48 47 
 Group:          Development/Languages/Java
48 
+Requires:       %{name} = %{version}-%{release}
49 49 
 %description	doc
50 50 
 It contains the documentation and demo applications for openjdk
51 
-Requires:       %{name} = %{version}-%{release}
52 51
53 
-%package 		src
52 
+%package 	src
54 53 
 Summary:        OpenJDK Java classes for developers
55 54 
 Group:          Development/Languages/Java
55 
+Requires:       %{name} = %{version}-%{release}
56 56 
 %description	src
57 57 
 This package provides the runtime library class sources.
58 
-Requires:       %{name} = %{version}-%{release}
59 58
60 59 
 %prep -p exit
61 60 
 %setup -q -n openjdk
... ... 
@@ -97,122 +97,159 @@ make DESTDIR=%{buildroot} install \
97 97 
 	DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
98 98 
 	CLASSPATH=/var/opt/OpenJDK-%bootstrapjdkversion-bin/jre
99 99
100 
-install -vdm755 %{buildroot}/var/opt/OpenJDK-%{version}-bin
101 
-chown -R root:root %{buildroot}/var/opt/OpenJDK-%{version}-bin
102 
-mkdir -p %{buildroot}/etc/profile.d
103 
-install -vdm755 %{buildroot}%{_rpmconfigdir}/macros.d
104 
-install -m 644 %{SOURCE1} %{buildroot}/%{_rpmconfigdir}/macros.d/
105 
-install -vdm644 %{buildroot}/etc/profile.d
106 
-mv /usr/local/jvm/openjdk-1.8.0-internal/* %{buildroot}/var/opt/OpenJDK-%{version}-bin/
100 
+install -vdm755 %{buildroot}%{_libdir}/jvm/OpenJDK-%{version}
101 
+chown -R root:root %{buildroot}%{_libdir}/jvm/OpenJDK-%{version}
102 
+install -vdm755 %{buildroot}%{_bindir}
103 
+find /usr/local/jvm/openjdk-1.8.0-internal/jre/lib/amd64 -iname \*.diz -delete
104 
+mv /usr/local/jvm/openjdk-1.8.0-internal/* %{buildroot}%{_libdir}/jvm/OpenJDK-%{version}/
107 105
108 
-cat >> %{buildroot}/etc/profile.d/java-exports.sh <<- "EOF"
109 
-export CLASSPATH=.:/usr/share/java
110 
-export JAVA_HOME=/var/opt/OpenJDK-%{version}-bin
111 
-export PATH="$PATH:/var/opt/OpenJDK-%{version}-bin/bin:/var/opt/OpenJDK-%{version}-bin/jre/bin"
112 
-EOF
106 
+%post
107 
+alternatives --install %{_bindir}/javac javac %{_libdir}/jvm/OpenJDK-%{version}/bin/javac 2000 \
108 
+  --slave %{_bindir}/appletviewer appletviewer %{_libdir}/jvm/OpenJDK-%{version}/bin/appletviewer \
109 
+  --slave %{_bindir}/extcheck extcheck %{_libdir}/jvm/OpenJDK-%{version}/bin/extcheck \
110 
+  --slave %{_bindir}/idlj idlj %{_libdir}/jvm/OpenJDK-%{version}/bin/idlj \
111 
+  --slave %{_bindir}/jar jar %{_libdir}/jvm/OpenJDK-%{version}/bin/jar \
112 
+  --slave %{_bindir}/jarsigner jarsigner %{_libdir}/jvm/OpenJDK-%{version}/bin/jarsigner \
113 
+  --slave %{_bindir}/javadoc javadoc %{_libdir}/jvm/OpenJDK-%{version}/bin/javadoc \
114 
+  --slave %{_bindir}/javah javah %{_libdir}/jvm/OpenJDK-%{version}/bin/javah \
115 
+  --slave %{_bindir}/javap javap %{_libdir}/jvm/OpenJDK-%{version}/bin/javap \
116 
+  --slave %{_bindir}/jcmd jcmd %{_libdir}/jvm/OpenJDK-%{version}/bin/jcmd \
117 
+  --slave %{_bindir}/jconsole jconsole %{_libdir}/jvm/OpenJDK-%{version}/bin/jconsole \
118 
+  --slave %{_bindir}/jdb jdb %{_libdir}/jvm/OpenJDK-%{version}/bin/jdb \
119 
+  --slave %{_bindir}/jdeps jdeps %{_libdir}/jvm/OpenJDK-%{version}/bin/jdeps \
120 
+  --slave %{_bindir}/jhat jhat %{_libdir}/jvm/OpenJDK-%{version}/bin/jhat \
121 
+  --slave %{_bindir}/jinfo jinfo %{_libdir}/jvm/OpenJDK-%{version}/bin/jinfo \
122 
+  --slave %{_bindir}/jmap jmap %{_libdir}/jvm/OpenJDK-%{version}/bin/jmap \
123 
+  --slave %{_bindir}/jps jps %{_libdir}/jvm/OpenJDK-%{version}/bin/jps \
124 
+  --slave %{_bindir}/jrunscript jrunscript %{_libdir}/jvm/OpenJDK-%{version}/bin/jrunscript \
125 
+  --slave %{_bindir}/jsadebugd jsadebugd %{_libdir}/jvm/OpenJDK-%{version}/bin/jsadebugd \
126 
+  --slave %{_bindir}/jstack jstack %{_libdir}/jvm/OpenJDK-%{version}/bin/jstack \
127 
+  --slave %{_bindir}/jstat jstat %{_libdir}/jvm/OpenJDK-%{version}/bin/jstat \
128 
+  --slave %{_bindir}/jstatd jstatd %{_libdir}/jvm/OpenJDK-%{version}/bin/jstatd \
129 
+  --slave %{_bindir}/native2ascii native2ascii %{_libdir}/jvm/OpenJDK-%{version}/bin/native2ascii \
130 
+  --slave %{_bindir}/rmic rmic %{_libdir}/jvm/OpenJDK-%{version}/bin/rmic \
131 
+  --slave %{_bindir}/schemagen schemagen %{_libdir}/jvm/OpenJDK-%{version}/bin/schemagen \
132 
+  --slave %{_bindir}/serialver serialver %{_libdir}/jvm/OpenJDK-%{version}/bin/serialver \
133 
+  --slave %{_bindir}/wsgen wsgen %{_libdir}/jvm/OpenJDK-%{version}/bin/wsgen \
134 
+  --slave %{_bindir}/wsimport wsimport %{_libdir}/jvm/OpenJDK-%{version}/bin/wsimport \
135 
+  --slave %{_bindir}/xjc xjc %{_libdir}/jvm/OpenJDK-%{version}/bin/xjc
113 136
114 
-chmod a+x %{buildroot}/etc/profile.d/java-exports.sh
137 
+%post -n openjre
138 
+alternatives --install %{_bindir}/java java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java 2000 \
139 
+  --slave %{_libdir}/jvm/jre jre %{_libdir}/jvm/OpenJDK-%{version}/jre \
140 
+  --slave %{_bindir}/jjs jjs %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/jjs \
141 
+  --slave %{_bindir}/keytool keytool %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/keytool \
142 
+  --slave %{_bindir}/orbd orbd %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/orbd \
143 
+  --slave %{_bindir}/pack200 pack200 %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/pack200 \
144 
+  --slave %{_bindir}/rmid rmid %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/rmid \
145 
+  --slave %{_bindir}/rmiregistry rmiregistry %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/rmiregistry \
146 
+  --slave %{_bindir}/servertool servertool %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/servertool \
147 
+  --slave %{_bindir}/tnameserv tnameserv %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/tnameserv \
148 
+  --slave %{_bindir}/unpack200 unpack200 %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/unpack200
115 149
116 
-%post
117 
-source /etc/profile.d/java-exports.sh
150 
+%postun
151 
+alternatives --remove javac %{_libdir}/jvm/OpenJDK-%{version}/bin/javac
152 
+
153 
+%postun -n openjre
154 
+alternatives --remove java %{_libdir}/jvm/OpenJDK-%{version}/jre/bin/java
118 155
119 156 
 %clean
120 157 
 rm -rf %{buildroot}/*
121 158
122 159 
 %files
123 160 
 %defattr(-,root,root)
124 
-/var/opt/OpenJDK-%{version}-bin/ASSEMBLY_EXCEPTION
125 
-/var/opt/OpenJDK-%{version}-bin/LICENSE
126 
-/var/opt/OpenJDK-%{version}-bin/release
127 
-/var/opt/OpenJDK-%{version}-bin/THIRD_PARTY_README
128 
-/var/opt/OpenJDK-%{version}-bin/lib
129 
-/var/opt/OpenJDK-%{version}-bin/include/
130 
-/var/opt/OpenJDK-%{version}-bin/bin/extcheck
131 
-/var/opt/OpenJDK-%{version}-bin/bin/idlj
132 
-/var/opt/OpenJDK-%{version}-bin/bin/jar
133 
-/var/opt/OpenJDK-%{version}-bin/bin/jarsigner
134 
-/var/opt/OpenJDK-%{version}-bin/bin/java-rmi.cgi
135 
-/var/opt/OpenJDK-%{version}-bin/bin/javac
136 
-/var/opt/OpenJDK-%{version}-bin/bin/javadoc
137 
-/var/opt/OpenJDK-%{version}-bin/bin/javah
138 
-/var/opt/OpenJDK-%{version}-bin/bin/javap
139 
-/var/opt/OpenJDK-%{version}-bin/bin/jcmd
140 
-/var/opt/OpenJDK-%{version}-bin/bin/jconsole
141 
-/var/opt/OpenJDK-%{version}-bin/bin/jdb
142 
-/var/opt/OpenJDK-%{version}-bin/bin/jdeps
143 
-/var/opt/OpenJDK-%{version}-bin/bin/jhat
144 
-/var/opt/OpenJDK-%{version}-bin/bin/jinfo
145 
-/var/opt/OpenJDK-%{version}-bin/bin/jjs
146 
-/var/opt/OpenJDK-%{version}-bin/bin/jmap
147 
-/var/opt/OpenJDK-%{version}-bin/bin/jps
148 
-/var/opt/OpenJDK-%{version}-bin/bin/jrunscript
149 
-/var/opt/OpenJDK-%{version}-bin/bin/jsadebugd
150 
-/var/opt/OpenJDK-%{version}-bin/bin/jstack
151 
-/var/opt/OpenJDK-%{version}-bin/bin/jstat
152 
-/var/opt/OpenJDK-%{version}-bin/bin/jstatd
153 
-/var/opt/OpenJDK-%{version}-bin/bin/native2ascii
154 
-/var/opt/OpenJDK-%{version}-bin/bin/rmic
155 
-/var/opt/OpenJDK-%{version}-bin/bin/schemagen
156 
-/var/opt/OpenJDK-%{version}-bin/bin/serialver
157 
-/var/opt/OpenJDK-%{version}-bin/bin/wsgen
158 
-/var/opt/OpenJDK-%{version}-bin/bin/wsimport
159 
-/var/opt/OpenJDK-%{version}-bin/bin/xjc
161 
+%dir %{_libdir}/jvm/OpenJDK-%{version}
162 
+%{_libdir}/jvm/OpenJDK-%{version}/ASSEMBLY_EXCEPTION
163 
+%{_libdir}/jvm/OpenJDK-%{version}/LICENSE
164 
+%{_libdir}/jvm/OpenJDK-%{version}/release
165 
+%{_libdir}/jvm/OpenJDK-%{version}/THIRD_PARTY_README
166 
+%{_libdir}/jvm/OpenJDK-%{version}/lib
167 
+%{_libdir}/jvm/OpenJDK-%{version}/include/
168 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/extcheck
169 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/idlj
170 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jar
171 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jarsigner
172 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/java-rmi.cgi
173 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/javac
174 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/javadoc
175 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/javah
176 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/javap
177 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jcmd
178 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jconsole
179 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jdb
180 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jdeps
181 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jhat
182 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jinfo
183 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jjs
184 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jmap
185 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jps
186 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jrunscript
187 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jsadebugd
188 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jstack
189 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jstat
190 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/jstatd
191 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/native2ascii
192 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/rmic
193 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/schemagen
194 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/serialver
195 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/wsgen
196 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/wsimport
197 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/xjc
160 198
161 199 
 %files	-n openjre
162 200 
 %defattr(-,root,root)
163 
-
164 
-/var/opt/OpenJDK-%{version}-bin/jre/
165 
-/var/opt/OpenJDK-%{version}-bin/bin/java
166 
-/var/opt/OpenJDK-%{version}-bin/bin/keytool
167 
-/var/opt/OpenJDK-%{version}-bin/bin/orbd
168 
-/var/opt/OpenJDK-%{version}-bin/bin/pack200
169 
-/var/opt/OpenJDK-%{version}-bin/bin/rmid
170 
-/var/opt/OpenJDK-%{version}-bin/bin/rmiregistry
171 
-/var/opt/OpenJDK-%{version}-bin/bin/servertool
172 
-/var/opt/OpenJDK-%{version}-bin/bin/tnameserv
173 
-/var/opt/OpenJDK-%{version}-bin/bin/unpack200
174 
-/var/opt/OpenJDK-%{version}-bin/lib/amd64/jli/
175 
-/etc/profile.d/java-exports.sh
176 
-%{_rpmconfigdir}/macros.d/macros.java
177 
-%exclude /var/opt/OpenJDK-%{version}-bin/jre/lib/amd64/*.diz
201 
+%{_libdir}/jvm/OpenJDK-%{version}/jre/
202 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/java
203 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/keytool
204 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/orbd
205 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/pack200
206 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/rmid
207 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/rmiregistry
208 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/servertool
209 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/tnameserv
210 
+%{_libdir}/jvm/OpenJDK-%{version}/bin/unpack200
211 
+%{_libdir}/jvm/OpenJDK-%{version}/lib/amd64/jli/
212 
+%exclude %{_libdir}/jvm/OpenJDK-%{version}/lib/amd64/*.diz
178 213
179 214 
 %files sample
180 215 
 %defattr(-,root,root)
181 
-/var/opt/OpenJDK-%{version}-bin/sample/
216 
+%{_libdir}/jvm/OpenJDK-%{version}/sample/
182 217
183 218 
 %files doc
184 219 
 %defattr(-,root,root)
185 
-/var/opt/OpenJDK-%{version}-bin/man/
186 
-/var/opt/OpenJDK-%{version}-bin/demo
220 
+%{_libdir}/jvm/OpenJDK-%{version}/man/
221 
+%{_libdir}/jvm/OpenJDK-%{version}/demo
187 222
188 223 
 %files src
189 224 
 %defattr(-,root,root)
190 
-/var/opt/OpenJDK-%{version}-bin/src.zip
225 
+%{_libdir}/jvm/OpenJDK-%{version}/src.zip
191 226
192 227 
 %changelog
228 
+*	Mon May 22 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-3
229 
+-	Use java alternatives.
193 230 
 *	Thu May 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-2
194 231 
 -	Exclude the redundant .diz files.
195 232 
 *	Mon Apr 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.131-1
196 233 
 -	Upgraded to version 1.8.0.131 and building Java from sources
197 
-*   Tue Mar 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.112-2
198 
--   add java rpm macros
199 
-*       Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.112-1
200 
--       Update to 1.8.0.112. addresses CVE-2016-5582 CVE-2016-5573
201 
-*       Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.102-1
202 
--       Update to 1.8.0.102, minor fixes in url, spelling.
203 
--       addresses CVE-2016-3598, CVE-2016-3606, CVE-2016-3610
204 
-*       Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.92-3
234 
+*	Tue Mar 28 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.112-2
235 
+-	add java rpm macros
236 
+*	Wed Dec 21 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.112-1
237 
+-	Update to 1.8.0.112. addresses CVE-2016-5582 CVE-2016-5573
238 
+*	Tue Oct 04 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.102-1
239 
+-	Update to 1.8.0.102, minor fixes in url, spelling.
240 
+-	addresses CVE-2016-3598, CVE-2016-3606, CVE-2016-3610
241 
+*	Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.92-3
205 242 
 -	Added version constraint to runtime dependencies
206 243 
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.92-2
207 244 
 -	GA - Bump release of all rpms
208 
-*       Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.92-1
245 
+*	Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.92-1
209 246 
 -	Updated to version 1.8.0.92
210 
-*       Mon May 2 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.72-3
211 
--       Move tools like javac to openjdk
212 
-*       Thu Apr 28 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.72-2
213 
--       Adding openjre as run time dependency for openjdk package
214 
-*       Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.8.0.72-1
215 
--       Updating Version.
247 
+*	Mon May 2 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.8.0.72-3
248 
+-	Move tools like javac to openjdk
249 
+*	Thu Apr 28 2016 Divya Thaluru <dthaluru@vmware.com> 1.8.0.72-2
250 
+- 	Adding openjre as run time dependency for openjdk package
251 
+*	Fri Feb 26 2016 Kumar Kaushik <kaushikk@vmware.com> 1.8.0.72-1
252 
+-	Updating Version.
216 253 
 *	Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 1.8.0.51-3
217 254 
 -	Change to use /var/opt path
218 255 
 *	Fri Sep 11 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.8.0.51-2
SPECS/protobuf/protobuf.spec
History View file @ 4b28ebc
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Google's data interchange format
2 2 
 Name:           protobuf
3 3 
 Version:        2.6.1
4 
-Release:        3%{?dist}
4 
+Release:        4%{?dist}
5 5 
 License:        BSD-3-Clause
6 6 
 Group:          Development/Libraries
7 7 
 Vendor:         VMware, Inc.
... ... 
@@ -12,6 +12,7 @@ Source0:        protobuf-%{version}.tar.gz
12 12 
 BuildRequires:  autoconf
13 13 
 BuildRequires:  automake
14 14 
 BuildRequires:  libtool
15 
+BuildRequires:	which
15 16 
 BuildRequires:  libstdc++
16 17 
 BuildRequires:  curl
17 18 
 BuildRequires:  make
... ... 
@@ -68,10 +69,10 @@ This contains protobuf python3 libraries.
68 68 
 %package        java
69 69 
 Summary:        protobuf java
70 70 
 Group:          Development/Libraries
71 
-BuildRequires:  openjre >= 1.8.0.45
72 
-BuildRequires:  openjdk >= 1.8.0.45
71 
+BuildRequires:  openjre >= %{JAVA_VERSION}
72 
+BuildRequires:  openjdk >= %{JAVA_VERSION}
73 73 
 BuildRequires:  apache-maven >= 3.3.3
74 
-Requires:       openjre >= 1.8.0.45
74 
+Requires:       openjre >= %{JAVA_VERSION}
75 75
76 76 
 %description    java
77 77 
 This contains protobuf java package.
... ... 
@@ -81,7 +82,9 @@ This contains protobuf java package.
81 81 
 autoreconf -iv
82 82
83 83 
 %build
84 
+export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
84 85 
 %configure --disable-silent-rules
86 
+
85 87 
 make %{?_smp_mflags}
86 88 
 pushd python
87 89 
 python setup.py build
... ... 
@@ -143,6 +146,8 @@ make check
143 143 
 %{_libdir}/java/protobuf/*.jar
144 144
145 145 
 %changelog
146 
+*   Fri May 19 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.6.1-4
147 
+-   Use JAVA_VERSION macro instead of hard coded version.
146 148 
 *   Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-3
147 149 
 -   Build protobuf python and java.
148 150 
 *   Mon Mar 20 2017 Vinay Kulkarni <kulkarniv@vmware.com> 2.6.1-2
support/package-builder/constants.py
History View file @ 4b28ebc
... ... 
@@ -18,7 +18,7 @@ class constants(object):
18 18 
     inputRPMSPath=""
19 19 
     rpmCheck=False
20 20 
     sourceRpmPath=""
21 
-    noDepsPackageList=["texinfo","bzip2","gettext","nspr","xz","bison","openjdk","go"]
21 
+    noDepsPackageList=["texinfo","bzip2","gettext","nspr","xz","bison","go"]
22 22 
     listToolChainPackages=[
23 23 
         "linux-api-headers",
24 24 
         "glibc",
... ... 
@@ -334,7 +334,15 @@ class constants(object):
334 334 
         #adding kernelrelease rpm macro
335 335 
         kernelrelease = constants.specData.getRelease("linux")
336 336 
         constants.specData.addMacro("KERNEL_RELEASE",kernelrelease)
337 
-
337 
+
338 
+	#adding openjre version rpm macro
339 
+        javaversion = constants.specData.getVersion("openjre")
340 
+        constants.specData.addMacro("JAVA_VERSION",javaversion)
341 
+
342 
+	#adding ant version rpm macro
343 
+        antversion = constants.specData.getVersion("apache-ant")
344 
+        constants.specData.addMacro("ANT_VERSION",antversion)
345 
+
338 346 
         #adding kernelsubrelease rpm macro
339 347 
         kernelversion = kernelversion.replace(".","")
340 348 
         if kernelversion.isdigit():