@@ -1,11 +1,11 @@

 Summary:        XML-XPath perl module

 Name:           XML-XPath

-Version:        1.37

+Version:        1.40

 Release:        1%{?dist}

 License:        GPL+

 URL:            http://search.cpan.org/~toddr/%{name}-%{version}/

 Source0:        https://cpan.metacpan.org/authors/id/M/MA/MANWAR/%{name}-%{version}.tar.gz

-%define sha1 XML-XPath=8cedbb3073e064f6c827697aad5539f26147a4f5

+%define sha1 XML-XPath=a373c9d071a6c675c77320a905053baa5e7a99ff

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -31,5 +31,7 @@ make %{?_smp_mflags} -k test

 %{_mandir}/man3/*

 %{_mandir}/man1/*

 %changelog

+*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 1.40-1

+-   Version update

 *   Tue Sep 6 2016 Xiaolin Li <xiaolinl@vmware.com> 1.37-1

 -   Initial build. First version

@@ -1,6 +1,6 @@

 Summary:        Configuration-management, application deployment, cloud provisioning system

 Name:           ansible

-Version:        2.1.1.0

+Version:        2.2.2.0

 Release:        1%{?dist}

 License:        GPLv3+

 URL:            https://www.ansible.com

@@ -8,7 +8,8 @@ Group:          Development/Libraries

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz

-%define sha1 ansible=f596a7950ebe839eaf650643e9afeb8c1307817a

+%define sha1 ansible=8ff8f39d8d65751e902ab26f06fee7b61b68f056

+

 BuildArch:      noarch

@@ -39,5 +40,7 @@ Ansible is a radically simple IT automation system. It handles configuration-man

 %{python_sitelib}/*

 %changelog

+*   Thu Apr 6 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.2.0-1

+-   Version update

 *   Wed Sep 21 2016 Xiaolin Li <xiaolinl@vmware.com> 2.1.1.0-1

 -   Initial build. First version

@@ -1,6 +1,6 @@

 Summary:        C, C++, Objective C and Objective C++ front-end for the LLVM compiler.

 Name:           clang

-Version:        3.9.1

+Version:        4.0.0

 Release:        1%{?dist}

 License:        NCSA

 URL:            http://clang.llvm.org

@@ -8,7 +8,7 @@ Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://releases.llvm.org/%{version}/cfe-%{version}.src.tar.xz

-%define sha1    cfe=95e4be54b70f32cf98a8de36821ea5495b84add8

+%define sha1    cfe=e2762800c93d9335781ea6a45af3f80845542ef5

 BuildRequires:  cmake

 BuildRequires:  llvm-devel = %{version}

 BuildRequires:  ncurses-devel

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

 %{_includedir}/*

 %changelog

+*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.0.0-1

+-   Version update

 *   Wed Jan 11 2017 Xiaolin Li <xiaolinl@vmware.com>  3.9.1-1

 -   Initial build.

@@ -1,11 +1,11 @@

 Summary:        Container Network Interface (CNI) plugins

 Name:           cni

-Version:        0.4.0

+Version:        0.5.1

 Release:        1%{?dist}

 License:        ASL 2.0

 URL:            https://github.com/containernetworking/cni

 Source0:        https://github.com/containernetworking/cni/archive/%{name}-v%{version}.tar.gz

-%define sha1 cni=86386f12730db7d6ba666956f851529b9d951366

+%define sha1 cni=c704cff26d8e786ca0efbd1751bf51fb7f64f1b3

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -37,5 +37,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_default_cni_plugins_dir}/*

 %changelog

+*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 0.5.1-1

+-   Version update

 *   Thu Feb 16 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.4.0-1

 -   Add CNI plugins package to PhotonOS.

deleted file mode 100644

@@ -1,196 +0,0 @@

-SUMMARY

-Remove MIUtilParse once https://reviews.llvm.org/D23882 is accepted.

-

-From:

-https://reviews.llvm.org/file/data/e4yr2fu3vndsceyt6xv7/PHID-FILE-pgisidny2ro3tylncbpm/D23883.diff

-

-Index: tools/lldb-mi/CMakeLists.txt

-===================================================================

-+++ tools/lldb-mi/CMakeLists.txt

-@@ -65,7 +65,6 @@

-   MIDriverBase.cpp

-   MIDriverMain.cpp

-   MIDriverMgr.cpp

--  MIUtilParse.cpp

-   MIUtilDateTimeStd.cpp

-   MIUtilDebug.cpp

-   MIUtilFileStd.cpp

-Index: tools/lldb-mi/MIUtilParse.h

-===================================================================

-+++ /dev/null

-@@ -1,93 +0,0 @@

--//===-- MIUtilParse.h ------------------------------------------*- C++ -*-===//

--//

--//                     The LLVM Compiler Infrastructure

--//

--// This file is distributed under the University of Illinois Open Source

--// License. See LICENSE.TXT for details.

--//

--//===----------------------------------------------------------------------===//

-- 

--#pragma once

-- 

--// Third party headers:

--#include "../lib/Support/regex_impl.h"

--

--// In-house headers:

--#include "MIUtilString.h"

-- 

--namespace MIUtilParse

--{

-- 

--//++ ============================================================================

--// Details: MI common code utility class. Used to parse the output

--//          returned from lldb commands using regex.

--//--

--class CRegexParser

--{

--  public:

--    // Helper class for keeping track of regex matches.

--    class Match

--    {

--        friend CRegexParser;

--      public:

--        /* ctor */ explicit Match(size_t nmatches)

--            : m_matchStrs(nmatches), m_maxMatches(nmatches)

--        {

--        }

--        size_t

--        GetMatchCount() const

--        {

--            return m_matchStrs.size();

--        }

--        CMIUtilString

--        GetMatchAtIndex(size_t i) const

--        {

--            if (m_matchStrs.size() > i)

--                return m_matchStrs[i];

--            return CMIUtilString();

--        }

--      private:

--        CMIUtilString::VecString_t m_matchStrs;

--        const size_t m_maxMatches;

--    };

-- 

--    // Methods:

--    // Compile the regular expression.

--    /* ctor */ explicit CRegexParser(const char *regexStr);

-- 

--    // Free the memory used by the regular expression.

--    /* dtor */ ~CRegexParser();

-- 

--    // No copies

--    CRegexParser(const CRegexParser&) = delete;

--    void operator=(CRegexParser&) = delete;

-- 

--    // Return the match at the index.

--    int

--    GetMatchCount(const Match& match) const

--    {

--        if (m_isValid)

--            return match.GetMatchCount();

--        return 0;

--    }

-- 

--    bool

--    IsValid() const

--    {

--        return m_isValid;

--    }

-- 

--    // Match the input against the regular expression.  Return an error

--    // if the number of matches is less than minMatches.  If the default

--    // minMatches value of 0 is passed, an error will be returned if

--    // the number of matches is less than the maxMatches value used to

--    // initialize Match.

--    bool

--    Execute(const char *input, Match& match, size_t minMatches = 0);

-- 

--  private:

--    llvm_regex_t m_emma;

--    const bool m_isValid;

--};

--

--}

-Index: tools/lldb-mi/MIUtilParse.cpp

-===================================================================

-+++ /dev/null

-@@ -1,75 +0,0 @@

--//===-- MIUtilParse.cpp ----------------------------------------*- C++ -*-===//

--//

--//                     The LLVM Compiler Infrastructure

--//

--// This file is distributed under the University of Illinois Open Source

--// License. See LICENSE.TXT for details.

--//

--//===----------------------------------------------------------------------===//

-- 

--// Third party headers:

--#include <memory>

--

--// In-house headers:

--#include "MIUtilParse.h"

-- 

--//++ ------------------------------------------------------------------------------------

--// Details: CRegexParser constructor.

--// Type:    Method.

--// Args:    regexStr - Pointer to the regular expression to compile.

--// Return:  None.

--// Throws:  None.

--//--

--MIUtilParse::CRegexParser::CRegexParser(const char *regexStr)

--    : m_isValid(llvm_regcomp(&m_emma, regexStr, REG_EXTENDED) == 0)

--{

--}

-- 

--//++ ------------------------------------------------------------------------------------

--// Details: CRegexParser destructor.

--// Type:    Method.

--// Args:    None.

--// Return:  None.

--// Throws:  None.

--//--

--MIUtilParse::CRegexParser::~CRegexParser()

--{

--    // Free up memory held within regex.

--    if (m_isValid)

--        llvm_regfree(&m_emma);

--}

-- 

--//++ ------------------------------------------------------------------------------------

--// Details: CRegexParser regex executer.

--//          Match the input against the regular expression.  Return an error

--//          if the number of matches is less than minMatches.  If the default

--//          minMatches value of 0 is passed, an error will be returned if

--//          the number of matches is less than the maxMatches value used to

--//          initialize Match.

--// Type:    Method.

--// Args:    input (R) - Pointer to UTF8 text data to be parsed.

--//          match (RW) - Reference to Match class.

--//          minMatches (R) - Minimum number of regex matches expected.

--// Return:  bool - True = minimum matches were met,

--//                 false = minimum matches were not met or regex failed.

--// Throws:  None.

--//--

--bool

--MIUtilParse::CRegexParser::Execute(const char *input, Match& match, size_t minMatches)

--{

--    if (!m_isValid)

--        return false;

-- 

--    std::unique_ptr<llvm_regmatch_t[]> matches(new llvm_regmatch_t[match.m_maxMatches]); // Array of matches

--   

--    if (llvm_regexec(&m_emma, input, match.m_maxMatches, matches.get(), 0) != 0)

--        return false;

-- 

--    size_t i;

--    for (i = 0; i < match.m_maxMatches && matches[i].rm_so >= 0; i++)

--    {

--        const int n = matches[i].rm_eo - matches[i].rm_so;

--        match.m_matchStrs[i].assign(input + matches[i].rm_so, n);

--    }

--    return i >= minMatches;

--}

deleted file mode 100644

@@ -1,146 +0,0 @@

-SUMMARY

-Replace uses of the local MIUtilParse::CRegexParser class with the LLVM support class llvm::Regex. This reduces duplication of code, and makes it possible to remove the MIUtilParse::CRegexParser class that requires LLVM internal implementation headers.

-

-Bug: https://llvm.org/bugs/show_bug.cgi?id=29138

-

-From:

-https://reviews.llvm.org/file/data/ne2lqkdbc54c2ismicnp/PHID-FILE-nxy5llvyrv2t6fgjeqef/D23882.diff

-Index: tools/lldb-mi/MICmdCmdData.cpp

-===================================================================

-+++ tools/lldb-mi/MICmdCmdData.cpp

-@@ -25,6 +25,9 @@

- #include "lldb/API/SBInstruction.h"

- #include "lldb/API/SBInstructionList.h"

- #include "lldb/API/SBStream.h"

-+#include "llvm/ADT/SmallVector.h"

-+#include "llvm/ADT/StringRef.h"

-+#include "llvm/Support/Regex.h"

- 

- // In-house headers:

- #include "MICmdCmdData.h"

-@@ -42,7 +45,6 @@

- #include "MICmdArgValConsume.h"

- #include "MICmnLLDBDebugSessionInfoVarObj.h"

- #include "MICmnLLDBUtilSBValue.h"

--#include "MIUtilParse.h"

- 

- //++ ------------------------------------------------------------------------------------

- // Details: CMICmdCmdDataEvaluateExpression constructor.

-@@ -1651,24 +1653,24 @@

-     // is remains is assumed to be the filename.

- 

-     // Match LineEntry using regex.

--    static MIUtilParse::CRegexParser g_lineentry_nocol_regex( 

--        "^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$");

--    static MIUtilParse::CRegexParser g_lineentry_col_regex( 

--        "^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$");

--        //                ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)

-+    static llvm::Regex g_lineentry_nocol_regex(

-+        llvm::StringRef("^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$"));

-+    static llvm::Regex g_lineentry_col_regex(

-+        llvm::StringRef("^ *LineEntry: \\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$"));

-+        //                                ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)

- 

--    MIUtilParse::CRegexParser::Match match(6);

-+    llvm::SmallVector<llvm::StringRef, 6> match;

- 

-     // First try matching the LineEntry with the column,

-     // then try without the column.

--    const bool ok = g_lineentry_col_regex.Execute(input, match) ||

--                    g_lineentry_nocol_regex.Execute(input, match);

-+    const bool ok = g_lineentry_col_regex.match(input, &match) ||

-+                    g_lineentry_nocol_regex.match(input, &match);

-     if (ok)

-     {

--        start = match.GetMatchAtIndex(1);

--        end   = match.GetMatchAtIndex(2);

--        file  = match.GetMatchAtIndex(3);

--        line  = match.GetMatchAtIndex(4);

-+        start = match[1];

-+        end   = match[2];

-+        file  = match[3];

-+        line  = match[4];

-     }

-     return ok;

- }

-Index: tools/lldb-mi/MICmdCmdSymbol.cpp

-===================================================================

-+++ tools/lldb-mi/MICmdCmdSymbol.cpp

-@@ -11,15 +11,17 @@

- 

- // Third Party Headers:

- #include "lldb/API/SBCommandInterpreter.h"

-+#include "llvm/ADT/SmallVector.h"

-+#include "llvm/ADT/StringRef.h"

-+#include "llvm/Support/Regex.h"

- 

- // In-house headers:

- #include "MICmdArgValFile.h"

- #include "MICmdCmdSymbol.h"

- #include "MICmnLLDBDebugSessionInfo.h"

- #include "MICmnMIResultRecord.h"

- #include "MICmnMIValueList.h"

- #include "MICmnMIValueTuple.h"

--#include "MIUtilParse.h"

- 

- //++ ------------------------------------------------------------------------------------

- // Details: CMICmdCmdSymbolListLines constructor.

-@@ -105,15 +107,15 @@

- ParseLLDBLineAddressHeader(const char *input, CMIUtilString &file)

- {

-     // Match LineEntry using regex.

--    static MIUtilParse::CRegexParser g_lineentry_header_regex( 

--        "^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$");

--        //                       ^1=file                  ^2=cu    ^3=module

-+    static llvm::Regex g_lineentry_header_regex(

-+        llvm::StringRef("^ *Lines found for file (.+) in compilation unit (.+) in `(.+)$"));

-+        //                                       ^1=file                  ^2=cu    ^3=module

- 

--    MIUtilParse::CRegexParser::Match match(4);

-+    llvm::SmallVector<llvm::StringRef, 4> match;

- 

--    const bool ok = g_lineentry_header_regex.Execute(input, match);

-+    const bool ok = g_lineentry_header_regex.match(input, &match);

-     if (ok)

--        file = match.GetMatchAtIndex(1);

-+        file = match[1];

-     return ok;

- }

- 

-@@ -141,23 +143,23 @@

-     // is remains is assumed to be the filename.

- 

-     // Match LineEntry using regex.

--    static MIUtilParse::CRegexParser g_lineentry_nocol_regex( 

--        "^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$");

--    static MIUtilParse::CRegexParser g_lineentry_col_regex( 

--        "^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$");

--        //     ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)

-+    static llvm::Regex g_lineentry_nocol_regex(

-+        llvm::StringRef("^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+)$"));

-+    static llvm::Regex g_lineentry_col_regex(

-+        llvm::StringRef("^ *\\[(0x[0-9a-fA-F]+)-(0x[0-9a-fA-F]+)\\): (.+):([0-9]+):[0-9]+$"));

-+        //                     ^1=start         ^2=end               ^3=f ^4=line ^5=:col(opt)

- 

--    MIUtilParse::CRegexParser::Match match(6);

-+    llvm::SmallVector<llvm::StringRef, 6> match;

- 

-     // First try matching the LineEntry with the column,

-     // then try without the column.

--    const bool ok = g_lineentry_col_regex.Execute(input, match) ||

--                    g_lineentry_nocol_regex.Execute(input, match);

-+    const bool ok = g_lineentry_col_regex.match(input, &match) ||

-+                    g_lineentry_nocol_regex.match(input, &match);

-     if (ok)

-     {

--        addr = match.GetMatchAtIndex(1);

--        file = match.GetMatchAtIndex(3);

--        line = match.GetMatchAtIndex(4);

-+        addr = match[1];

-+        file = match[3];

-+        line = match[4];

-     }

-     return ok;

- }

@@ -1,6 +1,6 @@

 Summary:        A next generation, high-performance debugger.

 Name:           lldb

-Version:        3.9.1

+Version:        4.0.0

 Release:        1%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

@@ -8,9 +8,7 @@ Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://releases.llvm.org/%{version}/%{name}-%{version}.src.tar.xz

-%define sha1    lldb=f6da59c9ed570c4c7091c25f0abe59aba0e29de3

-Patch0:         Replace-uses-of-MIUtilParse-CRegexParser-with-llvm-Regex.patch

-Patch1:         Remove-MIUtilParse.patch

+%define sha1    lldb=da78ed1453a5e62ff058bebf0cd91c8f51ec5504

 BuildRequires:  cmake

 BuildRequires:  llvm-devel = %{version}

 BuildRequires:  clang-devel = %{version}

@@ -38,8 +36,6 @@ for developing applications that use lldb.

 %prep

 %setup -q -n %{name}-%{version}.src

-%patch0

-%patch1

 %build

 mkdir -p build

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

 %{_includedir}/*

 %changelog

+*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.0.0-1

+-   Version update

 *   Wed Jan 11 2017 Xiaolin Li <xiaolinl@vmware.com>  3.9.1-1

 -   Initial build.

deleted file mode 100644

@@ -1,24 +0,0 @@

-cmake: Install CheckAtomic.cmake (needed by lldb)

-

-Summary:

-Install CheckAtomic.cmake along with other LLVM modules, therefore making it possible for other projects to use it. This file is needed for LLDB to be built standalone, and installing it was suggested in https://reviews.llvm.org/D23881.

-

-Patch by: Michał Górny

-

-Reviewers: krytarowski, zturner, eugenis, jyknight, labath, beanz

-

-Subscribers: beanz, llvm-commits

-

-Differential Revision: https://reviews.llvm.org/D23887

-Index: llvm/trunk/cmake/modules/CMakeLists.txt

-===================================================================

-+++ b/cmake/modules/CMakeLists.txt

-@@ -91,6 +91,5 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)

-     PATTERN LLVMConfig.cmake EXCLUDE

-     PATTERN LLVMConfigVersion.cmake EXCLUDE

-     PATTERN LLVM-Config.cmake EXCLUDE

--    PATTERN GetHostTriple.cmake EXCLUDE

--    PATTERN CheckAtomic.cmake EXCLUDE)

-+    PATTERN GetHostTriple.cmake EXCLUDE)

- endif()

@@ -1,6 +1,6 @@

 Summary:        A collection of modular and reusable compiler and toolchain technologies.

 Name:           llvm

-Version:        3.9.1

+Version:        4.0.0

 Release:        1%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

@@ -8,8 +8,7 @@ Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://releases.llvm.org/%{version}/%{name}-%{version}.src.tar.xz

-%define sha1    llvm=6349f3aa23250d6c56d709946415237e665a2d0d

-Patch0:         Install-CheckAtomic.cmake-needed-by-lldb.patch

+%define sha1    llvm=aee4524e2407f9fe5afc6f70c753180b907011d0

 BuildRequires:  cmake

 BuildRequires:  libxml2-devel

 Requires:       libxml2

@@ -27,7 +26,6 @@ for developing applications that use llvm.

 %prep

 %setup -q -n %{name}-%{version}.src

-#%patch0 -p1

 %build

 mkdir -p build

@@ -58,6 +56,7 @@ rm -rf %{buildroot}/*

 %defattr(-,root,root)

 %{_bindir}/*

 %{_libdir}/*.so

+%{_libdir}/*.so.*

 %files devel

 %{_libdir}/*.a

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

 %{_includedir}/*

 %changelog

+*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.0.0-1

+-   Version update

 *   Wed Jan 11 2017 Xiaolin Li <xiaolinl@vmware.com>  3.9.1-1

 -   Initial build.

deleted file mode 100644

@@ -1,98 +0,0 @@

-%define sourcever 3110000

-Summary:	A portable, high level programming interface to various calling conventions

-Name:		sqlite-autoconf

-Version:	3.11.0

-Release:	4%{?dist}

-License:	Public Domain

-URL:		http://www.sqlite.org

-Group:		System Environment/GeneralLibraries

-Vendor:		VMware, Inc.

-Distribution: Photon

-Source0:	http://sqlite.org/2016/%{name}-3110000.tar.gz

-%define sha1 sqlite-autoconf=e2d300e4b24af5ecd67a1396488893fa44864e36

-Obsoletes:	libsqlite

-Requires:	sqlite-libs = %{version}-%{release}

-Provides:	sqlite3

-%description

-This package contains most of the static files that comprise the

-www.sqlite.org website including all of the SQL Syntax and the 

-C/C++ interface specs and other miscellaneous documentation.

-

-%package -n sqlite-devel

-Summary:	sqlite3 link library & header files

-Group:		Development/Libraries

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

-%description -n sqlite-devel

-The sqlite devel package include the needed library link and

-header files for development.

-

-%package -n sqlite-libs

-Summary:	sqlite3 library

-Group:		Libraries

-Provides:	pkgconfig(sqlite3)

-%description -n sqlite-libs

-The sqlite3 library.

-

-%prep

-%setup -q -n %{name}-%{sourcever}

-%build

-./configure \

-	CFLAGS="%{optflags}" \

-	CXXFLAGS="%{optflags} -DSQLITE_ENABLE_FTS3=1 \

-	-DSQLITE_ENABLE_COLUMN_METADATA=1 \

-	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \

-	-DSQLITE_SECURE_DELETE=1" \

-	--prefix=%{_prefix} \

-	--bindir=%{_bindir} \

-	--libdir=%{_libdir} \

-	--disable-static

-make

-%install

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

-make DESTDIR=%{buildroot} install

-install -D -m644 sqlite3.1 %{buildroot}/%{_mandir}/man1/sqlite3.1

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

-rm -rf %{buildroot}/%{_infodir}

-%{_fixperms} %{buildroot}/*

-

-%check

-make %{?_smp_mflags} check

-

-%post -n sqlite-libs

-/sbin/ldconfig

-

-%postun	-n sqlite-libs

-/sbin/ldconfig

-

-%clean

-rm -rf %{buildroot}/*

-

-%files

-%defattr(-,root,root)

-%{_bindir}/*

-%{_mandir}/man1/*

-

-%files -n sqlite-devel

-%defattr(-,root,root)

-%{_libdir}/libsqlite3.so

-%{_libdir}/libsqlite3.so.0

-%{_libdir}/pkgconfig/*

-%{_includedir}/*

-

-%files -n sqlite-libs

-%defattr(-,root,root)

-%{_libdir}/libsqlite3.so.0.8.6

-

-%changelog

-*   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.11.0-4

--   Added -devel and -libs subpackages

-*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3

--   Modified %check

-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.11.0-2

--   GA - Bump release of all rpms

-*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.11.0-1

--   Updated to version 3.11.0

-*   Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> - 3.8.3.1-2

--   Fix versioning

-*   Mon Oct 7 2014 Divya Thaluru <dthaluru@vmware.com> 3080301-1

--   Initial build. First version

new file mode 100644

@@ -0,0 +1,102 @@

+%define sourcever 3180000

+Summary:	A portable, high level programming interface to various calling conventions

+Name:		sqlite

+Version:	3.18.0

+Release:	1%{?dist}

+License:	Public Domain

+URL:		http://www.sqlite.org

+Group:		System Environment/GeneralLibraries

+Vendor:		VMware, Inc.

+Distribution: Photon

+Source0:	http://sqlite.org/2016/%{name}-autoconf-3180000.tar.gz

+%define sha1 sqlite=74559194e1dd9b9d577cac001c0e9d370856671b

+Obsoletes:	sqlite-autoconf

+Requires:	sqlite-libs = %{version}-%{release}

+Provides:	sqlite3

+%description

+This package contains most of the static files that comprise the

+www.sqlite.org website including all of the SQL Syntax and the 

+C/C++ interface specs and other miscellaneous documentation.

+

+%package devel

+Summary:	sqlite3 link library & header files

+Group:		Development/Libraries

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

+%description devel

+The sqlite devel package include the needed library link and

+header files for development.

+

+%package libs

+Summary:	sqlite3 library

+Group:		Libraries

+Provides:	pkgconfig(sqlite3)

+Obsoletes:	libsqlite

+%description libs

+The sqlite3 library.

+

+%prep

+%setup -q -n %{name}-autoconf-%{sourcever}

+%build

+./configure \

+	CFLAGS="%{optflags}" \

+	CXXFLAGS="%{optflags} -DSQLITE_ENABLE_FTS3=1 \

+	-DSQLITE_ENABLE_COLUMN_METADATA=1 \

+	-DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \

+	-DSQLITE_SECURE_DELETE=1" \

+	--prefix=%{_prefix} \

+	--bindir=%{_bindir} \

+	--libdir=%{_libdir} \

+	--disable-static

+make

+%install

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

+make DESTDIR=%{buildroot} install

+install -D -m644 sqlite3.1 %{buildroot}/%{_mandir}/man1/sqlite3.1

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

+rm -rf %{buildroot}/%{_infodir}

+%{_fixperms} %{buildroot}/*

+

+%check

+make %{?_smp_mflags} check

+

+%post libs

+/sbin/ldconfig

+

+%postun	libs

+/sbin/ldconfig

+

+%clean

+rm -rf %{buildroot}/*

+

+%files

+%defattr(-,root,root)

+%{_bindir}/*

+%{_mandir}/man1/*

+

+%files devel

+%defattr(-,root,root)

+%{_libdir}/libsqlite3.so

+%{_libdir}/libsqlite3.so.0

+%{_libdir}/pkgconfig/*

+%{_includedir}/*

+

+%files libs

+%defattr(-,root,root)

+%{_libdir}/libsqlite3.so.0.8.6

+

+%changelog

+*   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 3.18.0-1

+-   Version update

+-   Package rename: sqlite-autoconf -> sqlite

+*   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 3.11.0-4

+-   Added -devel and -libs subpackages

+*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 3.11.0-3

+-   Modified %check

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

+-   GA - Bump release of all rpms

+*   Tue Feb 23 2016 Xiaolin Li <xiaolinl@vmware.com> 3.11.0-1

+-   Updated to version 3.11.0

+*   Wed Feb 03 2016 Anish Swaminathan <anishs@vmware.com> - 3.8.3.1-2

+-   Fix versioning

+*   Mon Oct 7 2014 Divya Thaluru <dthaluru@vmware.com> 3080301-1

+-   Initial build. First version

@@ -3,7 +3,7 @@

                   "bzip2","pkg-config","ncurses","ncurses-compat","cracklib","cracklib-dicts","cracklib-python",

                   "shadow","coreutils","grep","readline","findutils","xz","util-linux","e2fsprogs",

                   "libffi","expat","linux","cpio","Linux-PAM","attr","libcap", "systemd","dbus",

-                  "gzip", "sqlite-autoconf","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo",

+                  "gzip", "sqlite","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo",

                   "hawkey", "python2","python2-libs","pcre","glib", "tdnf", "python-requests",

                   "grub2", "grub2-efi", "efibootmgr", "efivar","dracut", "curl", "dosfstools"]

 }

@@ -37,7 +37,7 @@ mkdir $TEMP_CHROOT

 rpm --root $TEMP_CHROOT/ --initdb

 # TODO: remove this line after updating photon-build image with new

 # versions of sqlite and rpm with -libs subpackages

-tdnf upgrade -y -v sqlite-autoconf rpm

+tdnf upgrade -y -v sqlite rpm

 tdnf upgrade -y tdnf

 tdnf --installroot $TEMP_CHROOT/ install -y bash coreutils filesystem findutils glibc grep photon-release photon-repos tdnf util-linux vim which

@@ -689,8 +689,8 @@ sed-lang.deploy=optional

 shadow.package-name=shadow

 shadow.deploy=micro,minimal,iso

-sqlite-autoconf.package-name=sqlite-autoconf

-sqlite-autoconf.deploy=micro,minimal,iso

+sqlite.package-name=sqlite

+sqlite.deploy=micro,minimal,iso

 sudo.package-name=sudo

 sudo.deploy=optional

@@ -116,6 +116,9 @@ class ToolChainUtils(object):

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

             rpmFile=pkgUtils.findRPMFileForGivenPackage(package)

             if rpmFile is None:

+                # sqlite-autoconf package was renamed, but it still published as sqlite-autoconf

+                if package == "sqlite":

+                    package = "sqlite-autoconf"

                 rpmFile=self.findRPMFileInGivenLocation(package, constants.prevPublishRPMRepo)

                 if rpmFile is None:

                     if package in constants.listOfRPMsProvidedAfterBuild:

@@ -280,7 +280,7 @@

         <package id="sed-lang"

                  spec="sed"/>

         <package id="shadow"/>

-        <package id="sqlite-autoconf"/>

+        <package id="sqlite"/>

         <package id="sudo"/>

         <package id="swig"/>

         <package id="systemd"/>

@@ -382,7 +382,7 @@

         <pkgref id="rpm"/>

         <pkgref id="sed"/>

         <pkgref id="shadow"/>

-        <pkgref id="sqlite-autoconf"/>

+        <pkgref id="sqlite"/>

         <pkgref id="systemd"/>

         <pkgref id="tar"/>

         <pkgref id="texinfo"/>

@@ -447,7 +447,7 @@

         <pkgref id="readline"/>

         <pkgref id="rpm"/>

         <pkgref id="shadow"/>

-        <pkgref id="sqlite-autoconf"/>

+        <pkgref id="sqlite"/>

         <pkgref id="systemd"/>

         <pkgref id="tdnf"/>

         <pkgref id="util-linux"/>

@@ -533,7 +533,7 @@

         <pkgref id="rpm"/>

         <pkgref id="sed"/>

         <pkgref id="shadow"/>

-        <pkgref id="sqlite-autoconf"/>

+        <pkgref id="sqlite"/>

         <pkgref id="systemd"/>

         <pkgref id="tdnf"/>

         <pkgref id="util-linux"/>

@@ -78,7 +78,7 @@ class constants(object):

         "lua",

         "popt",

         "nspr",

-        "sqlite-autoconf",

+        "sqlite",

         "nss",

         "elfutils",

         "expat",

@@ -154,7 +154,7 @@ class constants(object):

         "popt",

         "popt-devel",

         "nspr",

-        "sqlite-autoconf",

+        "sqlite",

         "sqlite-libs",

         "nss",

         "nss-devel",

@@ -190,6 +190,7 @@ class constants(object):

     listOfRPMsProvidedAfterBuild=[

         "util-linux-devel",

         "flex-devel",

+        "sqlite",

         "sqlite-libs",

         "rpm-libs"]

@@ -225,6 +226,7 @@ class constants(object):

         "openssl-devel",

         "net-tools",

         "less",

+        "iana-etc",

         "yum-metadata-parser",

         "yum",

         "rpm-devel",