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

 Summary:        C++ L7 proxy and communication bus

 Name:           envoy

 Version:        1.2.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Apache-2.0

 URL:            https://github.com/lyft/envoy

 Source0:        %{name}-v%{version}.tar.gz

@@ -51,6 +51,13 @@ Requires:       protobuf

 %description

 Envoy is a L7 proxy and communication bus designed for large modern service oriented architectures.

+%package test

+Summary: Contains envoy-test and envoy.gdb tools

+Group: Development/Tools

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

+%description test

+Contains envoy-test and envoy.gdb tools

+

 %prep

 %setup -q

 cp %{SOURCE1} %{_builddir}/%{name}-%{version}/

@@ -61,6 +68,7 @@ git -c user.name='Envoy Builder' -c user.email='nobody@noorg.org' tag -a 'v%{ver

 git checkout 'v%{version}'

 sed -i "s#-Werror##g" common.cmake

 sed -i "s#static-libstdc++#lstdc++#g" CMakeLists.txt

+sed -i '/target_link_libraries(envoy-test gmock)/a target_link_libraries(envoy-test gtest)' test/CMakeLists.txt

 %build

 export CC=`which gcc`

@@ -102,11 +110,13 @@ cp ../configs/* %{buildroot}%{_sysconfdir}/envoy

 %{_bindir}/envoy

 %config(noreplace) %{_sysconfdir}/envoy/*

-%files debuginfo

+%files test

 %defattr(-,root,root)

 %{_bindir}/envoy-test

 %{_bindir}/envoy.dbg

 %changelog

-*    Thu Jun 29 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.2.0-1

--    Initial version of envoy package for Photon.

+* Mon Sep 24 2018 Alexey Makhalov <amakhalov@vmware.com> 1.2.0-2

+- Fix compilation issue. Add test subpackage

+* Thu Jun 29 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.2.0-1

+- Initial version of envoy package for Photon.

deleted file mode 100644

@@ -1,71 +0,0 @@

-Summary:	Google's C++ gmock framework

-Name:		gmock

-Version:	1.8.0

-Release:	2%{?dist}

-License:	ASL 2.0

-URL:		https://github.com/google/googletest

-Source0:	https://github.com/google/googletest/archive/googletest-%{version}.tar.gz

-%define sha1 googletest=e7e646a6204638fe8e87e165292b8dd9cd4c36ed

-Group:		Development/Tools

-Vendor:		VMware, Inc.

-Distribution: 	Photon

-BuildRequires:  autoconf

-BuildRequires:  automake

-BuildRequires:  cmake

-BuildRequires:  make

-BuildRequires:  gcc

-

-%description

-Google's C++ test framework that combines the GoogleTest and GoogleMock projects. This package provides gmock shared libraries.

-

-%package devel

-Summary:        libgmock headers

-Group:          Development/Tools

-%description devel

-This contains libgmock header files.

-

-%package static

-Summary:        libgmock static lib

-Group:          Development/Tools

-%description static

-This contains libgmock static library.

-

-%prep

-%setup -n googletest-release-%{version}

-

-%build

-cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DBUILD_SHARED_LIBS=OFF .

-make

-cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DBUILD_SHARED_LIBS=ON .

-make

-

-%install

-make DESTDIR=%{buildroot} install

-rm -rf %{buildroot}/%{_includedir}/gtest

-rm -f %{buildroot}/%{_libdir}/libgtest*

-install -p -m 644 -t %{buildroot}/usr/lib googlemock/libgmock.a

-install -p -m 644 -t %{buildroot}/usr/lib googlemock/libgmock_main.a

-install -vdm 755 %{buildroot}/usr/src/gmock/src/

-cp googlemock/src/* %{buildroot}/usr/src/gmock/src/

-find %{buildroot} -name '*.la' -delete

-

-%files

-%defattr(-,root,root)

-%{_libdir}/libgmock.so

-%{_libdir}/libgmock_main.so

-

-%files devel

-%defattr(-,root,root)

-%{_includedir}/gmock/*

-/usr/src/gmock/

-

-%files static

-%defattr(-,root,root)

-%{_libdir}/libgmock.a

-%{_libdir}/libgmock_main.a

-

-%changelog

-*    Thu May 04 2017 Anish Swaminathan <anishs@vmware.com> 1.8.0-2

--    Add gmock sources in devel package

-*    Mon Apr 10 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.0-1

--    Initial version of libgmock package for Photon.

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

 Summary:	Google's C++ gtest framework

 Name:		gtest

 Version:	1.8.1

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	ASL 2.0

 URL:		https://github.com/google/googletest

 Source0:	https://github.com/google/googletest/archive/googletest-%{version}.tar.gz

@@ -30,6 +30,25 @@ Group:          Development/Tools

 %description static

 This contains libgtest static library.

+%package -n gmock

+Summary: Google's C++ gmock framework

+Group: Development/Tools

+%description -n gmock

+Google's C++ test framework that combines the GoogleTest and GoogleMock projects. This package provides gmock shared libraries.

+

+%package -n gmock-devel

+Summary:        libgmock headers

+Group:          Development/Tools

+%description -n gmock-devel

+This contains libgmock header files.

+

+%package -n gmock-static

+Summary:        libgtest static lib

+Group:          Development/Tools

+%description -n gmock-static

+This contains libgmock static library.

+

+

 %prep

 %setup -n googletest-release-%{version}

@@ -41,18 +60,22 @@ make

 %install

 make DESTDIR=%{buildroot} install

-rm -rf %{buildroot}/%{_includedir}/gmock

-rm -f %{buildroot}/%{_libdir}/libgmock*

+install -p -m 644 -t %{buildroot}/usr/lib64 googlemock/libgmock.a

+install -p -m 644 -t %{buildroot}/usr/lib64 googlemock/libgmock_main.a

 install -p -m 644 -t %{buildroot}/usr/lib64 googlemock/gtest/libgtest.a

 install -p -m 644 -t %{buildroot}/usr/lib64 googlemock/gtest/libgtest_main.a

 install -vdm 755 %{buildroot}/usr/src/gtest/src/

+install -vdm 755 %{buildroot}/usr/src/gmock/src/

 cp googletest/src/* %{buildroot}/usr/src/gtest/src/

+cp googlemock/src/* %{buildroot}/usr/src/gmock/src/

 find %{buildroot} -name '*.la' -delete

 %files

 %defattr(-,root,root)

 %{_lib64dir}/libgtest.so

 %{_lib64dir}/libgtest_main.so

+

+%files -n gmock

 %{_lib64dir}/libgmock.so

 %{_lib64dir}/libgmock_main.so

@@ -63,12 +86,23 @@ find %{buildroot} -name '*.la' -delete

 %{_lib64dir}/cmake/GTest/*.cmake

 %{_lib64dir}/pkgconfig/*.pc

+%files -n gmock-devel

+%{_includedir}/gmock/*

+/usr/src/gmock/

+

+%files -n gmock-static

+%defattr(-,root,root)

+%{_lib64dir}/libgmock.a

+%{_lib64dir}/libgmock_main.a

+

 %files static

 %defattr(-,root,root)

 %{_lib64dir}/libgtest.a

 %{_lib64dir}/libgtest_main.a

 %changelog

+*    Sun Sep 23 2018 Sharath George <anishs@vmware.com> 1.8.1-2

+-    Add gmock subpackage

 *    Wed Sep 12 2018 Anish Swaminathan <anishs@vmware.com> 1.8.1-1

 -    Update version to 1.8.1

 *    Thu May 04 2017 Anish Swaminathan <anishs@vmware.com> 1.8.0-2

@@ -191,38 +191,38 @@ def buildSRPMList(srpmPath, yamlDir, blackListPkgs, logger, singleFile=True):

         if package in blackListPkgs:

             continue

         ossname = package

-        ossversion = SPECS.getData().getVersion(package)

-        ossrelease = SPECS.getData().getRelease(package, ossversion)

-

-        listFoundSRPMFiles = cmdUtils.findFile(ossname + "-" + ossversion + "-" + ossrelease

-                                               + ".src.rpm",

-                                               srpmPath)

-        srpmName = None

-        if len(listFoundSRPMFiles) == 1:

-            srpmFullPath = listFoundSRPMFiles[0]

-            srpmName = os.path.basename(srpmFullPath)

-            cpcmd = "cp " + srpmFullPath + " " + yamlSrpmDir + "/"

-            returnVal = cmdUtils.runCommandInShell(cpcmd)

-            if not returnVal:

-                logger.error("Copy SRPM File is failed for package:" + ossname)

-        else:

-            logger.error("SRPM file is not found:" + ossname)

-

-        if not singleFile:

-            yamlFile = open(yamlSrpmDir + "/" + ossname + "-" + ossversion + "-"

-                            + ossrelease + ".yaml", "w")

-

-        yamlFile.write("baseos:" + ossname + ":" + ossversion + "-" + ossrelease + ":\n")

-        yamlFile.write("  repository: BaseOS\n")

-        yamlFile.write("  name: '" + ossname + "'\n")

-        yamlFile.write("  version: '" + ossversion + "-" + ossrelease + "'\n")

-        yamlFile.write("  url: 'http://www.vmware.com'\n")

-        yamlFile.write("  baseos-style: rpm\n")

-        yamlFile.write("  baseos-source: '" + str(srpmName) + "'\n")

-        yamlFile.write("  baseos-osname: 'photon'\n")

-        yamlFile.write("\n")

-        if not singleFile:

-            yamlFile.close()

+        for ossversion in SPECS.getData().getVersions(package):

+            ossrelease = SPECS.getData().getRelease(package, ossversion)

+

+            listFoundSRPMFiles = cmdUtils.findFile(ossname + "-" + ossversion + "-" + ossrelease

+                                                   + ".src.rpm",

+                                                   srpmPath)

+            srpmName = None

+            if len(listFoundSRPMFiles) == 1:

+                srpmFullPath = listFoundSRPMFiles[0]

+                srpmName = os.path.basename(srpmFullPath)

+                cpcmd = "cp " + srpmFullPath + " " + yamlSrpmDir + "/"

+                returnVal = cmdUtils.runCommandInShell(cpcmd)

+                if not returnVal:

+                    logger.error("Copy SRPM File is failed for package:" + ossname)

+            else:

+                logger.error("SRPM file is not found:" + ossname)

+

+            if not singleFile:

+                yamlFile = open(yamlSrpmDir + "/" + ossname + "-" + ossversion + "-"

+                                + ossrelease + ".yaml", "w")

+

+            yamlFile.write("baseos:" + ossname + ":" + ossversion + "-" + ossrelease + ":\n")

+            yamlFile.write("  repository: BaseOS\n")

+            yamlFile.write("  name: '" + ossname + "'\n")

+            yamlFile.write("  version: '" + ossversion + "-" + ossrelease + "'\n")

+            yamlFile.write("  url: 'http://www.vmware.com'\n")

+            yamlFile.write("  baseos-style: rpm\n")

+            yamlFile.write("  baseos-source: '" + str(srpmName) + "'\n")

+            yamlFile.write("  baseos-osname: 'photon'\n")

+            yamlFile.write("\n")

+            if not singleFile:

+                yamlFile.close()

     if singleFile:

         yamlFile.close()

@@ -24,30 +24,30 @@ class PackageInfo(object):

         listRPMFiles = []

         cmdUtils = CommandUtils()

         for package in listPackages:

-            version = SPECS.getData().getVersion(package)

-            release = SPECS.getData().getRelease(package, version)

-            listRPMPackages = SPECS.getData().getRPMPackages(package)

-            srpmFileName = package + "-" + version + "-" + release + ".src.rpm"

-            srpmFiles = cmdUtils.findFile(srpmFileName, constants.sourceRpmPath)

-            srpmFile = None

-            if len(srpmFiles) == 1:

-                srpmFile = srpmFiles[0]

-            debugrpmFileName = package + "-debuginfo-" + version + "-" + release + "*"

-            debugrpmFiles = cmdUtils.findFile(debugrpmFileName, constants.rpmPath)

-            debugrpmFile = None

-            if len(debugrpmFiles) == 1:

-                debugrpmFile = debugrpmFiles[0]

-            pkgUtils = PackageUtils(self.logName, self.logPath)

-            for rpmPkg in listRPMPackages:

-                rpmFile = pkgUtils.findRPMFileForGivenPackage(rpmPkg)

-                if rpmFile is not None:

-                    listRPMFiles.append(rpmFile)

-                    listPkgAttributes = {"sourcerpm":srpmFile, "rpm":rpmFile,

-                                         "debugrpm":debugrpmFile}

-                    self.pkgList[rpmPkg] = listPkgAttributes

-                    self.logger.debug("Added " + rpmPkg + " rpm package to the list")

-                else:

-                    self.logger.error("Missing rpm file for package:" + rpmPkg)

+            for version in SPECS.getData().getVersions(package):

+                release = SPECS.getData().getRelease(package, version)

+                listRPMPackages = SPECS.getData().getRPMPackages(package, version)

+                srpmFileName = package + "-" + version + "-" + release + ".src.rpm"

+                srpmFiles = cmdUtils.findFile(srpmFileName, constants.sourceRpmPath)

+                srpmFile = None

+                if len(srpmFiles) == 1:

+                    srpmFile = srpmFiles[0]

+                debugrpmFileName = package + "-debuginfo-" + version + "-" + release + "*"

+                debugrpmFiles = cmdUtils.findFile(debugrpmFileName, constants.rpmPath)

+                debugrpmFile = None

+                if len(debugrpmFiles) == 1:

+                    debugrpmFile = debugrpmFiles[0]

+                pkgUtils = PackageUtils(self.logName, self.logPath)

+                for rpmPkg in listRPMPackages:

+                    rpmFile = pkgUtils.findRPMFileForGivenPackage(rpmPkg)

+                    if rpmFile is not None:

+                        listRPMFiles.append(rpmFile)

+                        listPkgAttributes = {"sourcerpm":srpmFile, "rpm":rpmFile,

+                                             "debugrpm":debugrpmFile}

+                        self.pkgList[rpmPkg] = listPkgAttributes

+                        self.logger.debug("Added " + rpmPkg + " rpm package to the list")

+                    else:

+                        self.logger.error("Missing rpm file for package:" + rpmPkg)

     def writePkgListToFile(self, fileName):

         self.logger.info("Writing package list to the json file")