@@ -314,8 +314,7 @@ sources:

 sources-cached:

 	@echo "Using cached SOURCES..."

-	@$(MKDIR) -p $(PHOTON_SRCS_DIR) && \

-	 $(CP) -rf $(PHOTON_SOURCES_PATH)/* $(PHOTON_SRCS_DIR)/

+	@ln -sf $(PHOTON_SOURCES_PATH) $(PHOTON_SRCS_DIR)

 publish-rpms:

 	@echo "Pulling publish rpms from bintray..."

@@ -9,7 +9,7 @@ Source0:		http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/%{name}-%{version}.t

 Group:		Development/Tools

 Vendor:		VMware, Inc.

 Distribution:	Photon

-BuildRequires:	expat

+BuildRequires:	expat-devel

 Requires:	expat

 %description

 The XML::Parser module is a Perl extension interface to James Clark's XML parser, expat

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

 Summary:    The Apache Portable Runtime Utility Library

 Name:       apr-util

 Version:    1.5.4

-Release:    8%{?dist}

+Release:    9%{?dist}

 License:    Apache License 2.0

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

 Group:      System Environment/Libraries

@@ -15,8 +15,10 @@ BuildRequires:   apr-devel

 BuildRequires:   sqlite-devel

 BuildRequires:   openssl-devel

 BuildRequires:   nss-devel

+BuildRequires:   expat-devel

 Requires:   apr

 Requires:   openssl

+Requires:   expat

 %description

 The Apache Portable Runtime Utility Library.

@@ -24,7 +26,8 @@ The Apache Portable Runtime Utility Library.

 Group: Development/Libraries

 Summary: APR utility library development kit

 Requires: apr-devel

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

+Requires: expat-devel

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

 %description devel

 This package provides the support files which can be used to 

 build applications using the APR utility library.

@@ -115,6 +118,8 @@ rm -rf $RPM_BUILD_ROOT

 %{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*

 %changelog

+*   Tue Apr 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.5.4-9

+-   Add expat-devel build deps otherwise it builds expat from its source tree

 *   Fri Nov 18 2016 Alexey Makhalov <amakhalov@vmware.com> 1.5.4-8

 -   Add sqlite-devel build deps

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.4-7

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

 Summary:	Contains programs for compressing and decompressing files

 Name:		bzip2

 Version:	1.0.6

-Release:	6%{?dist}

+Release:	7%{?dist}

 License:	BSD

 URL:		http://www.bzip.org/

 Group:		System Environment/Base

@@ -12,15 +12,24 @@ Provides:    libbz2.so.1()(64bit)

 %define sha1 bzip2=3f89f861209ce81a6bab1fd1998c0ef311712002

 Patch0:		http://www.linuxfromscratch.org/patches/lfs/7.2/bzip2-1.0.6-install_docs-1.patch

 Patch1:         CVE-2016-3189.patch

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

 %description

 The Bzip2 package contains programs for compressing and

 decompressing files.  Compressing text files with bzip2 yields a much better

 compression percentage than with the traditional gzip.

+

 %package	devel

 Summary:	Header and development files for bzip2

 Requires:	bzip2

 %description	devel

 It contains the libraries and header files to create applications 

+

+%package libs

+Summary: Libraries for bzip2

+Group:      System Environment/Libraries

+%description libs

+This package contains minimal set of shared bzip2 libraries.

+

 %prep

 %setup -q

 %patch0 -p1

@@ -60,10 +69,6 @@ make %{?_smp_mflags} check

 %{_bindir}/bzip2recover

 %{_bindir}/bzegrep

 %{_bindir}/bzmore

-%{_docdir}/bzip2-1.0.6/manual.pdf

-%{_docdir}/bzip2-1.0.6/bzip2.txt

-%{_docdir}/bzip2-1.0.6/manual.ps

-%{_docdir}/bzip2-1.0.6/manual.html

 %{_mandir}/man1/bzmore.1.gz

 %{_mandir}/man1/bzfgrep.1.gz

 %{_mandir}/man1/bzegrep.1.gz

@@ -72,22 +77,27 @@ make %{?_smp_mflags} check

 %{_mandir}/man1/bzcmp.1.gz

 %{_mandir}/man1/bzless.1.gz

 %{_mandir}/man1/bzip2.1.gz

-%{_lib}/libbz2.so.1.0.6

-%{_lib}/libbz2.so.1.0

-%{_lib}/libbz2.so.1

+

 %files devel

 %{_includedir}/bzlib.h

 %{_libdir}/libbz2.so

+%{_docdir}/*

+

+%files libs

+%{_lib}/libbz2.so.*

+

 %changelog

-*       Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.6-6

--       Fixing security bug CVE-2016-3189.

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0.6-5

--	GA - Bump release of all rpms

-*	Tue Nov 10 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 1.0.6-4

--	Providing libbz2.so.1, miror fix for devel provides.

-*	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.6-3

--	Adding bzip2 package run time required package for bzip2-devel package 

-*	Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2

--	Update according to UsrMove.

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.0.6-1

--	Initial build.	First version

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

+-   Added -libs subpackage

+*   Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 1.0.6-6

+-   Fixing security bug CVE-2016-3189.

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

+-   GA - Bump release of all rpms

+*   Tue Nov 10 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 1.0.6-4

+-   Providing libbz2.so.1, miror fix for devel provides.

+*   Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.6-3

+-   Adding bzip2 package run time required package for bzip2-devel package 

+*   Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.0.6-2

+-   Update according to UsrMove.

+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 1.0.6-1

+-   Initial build.	First version

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

 Summary:  Certificate Authority certificates 

 Name:   ca-certificates

 Version:  20170406

-Release:  1%{?dist}

+Release:  2%{?dist}

 License:  Custom

 URL:    http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/

 Group:    System Environment/Security

@@ -10,6 +10,7 @@ Distribution: Photon

 Source0:  certdata.txt

 Requires:   openssl

 BuildRequires:  openssl

+Requires:   ca-certificates-pki = %{version}-%{release}

 Provides:       ca-certificates-mozilla

 %description

 The Public Key Inrastructure is used for many security issues in a

@@ -19,6 +20,12 @@ certificates loaded by this section are from the list on the Mozilla

 version control system and formats it into a form used by 

 OpenSSL-1.0.1e. The certificates can also be used by other applications

 either directly of indirectly through openssl.

+%package pki

+Summary:  Certificate Authority certificates (pki tls certs)

+Group:    System Environment/Security

+%description pki

+Certificate Authority certificates (pki tls certs)

+

 %prep -p exit

 %build

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

@@ -226,12 +233,16 @@ exit 0

 %clean

 %files

 %defattr(-,root,root)

-/etc/pki/tls/certs/ca-bundle.crt

 /etc/ssl/certs/*

 /bin/make-ca.sh

 /bin/remove-expired-certs.sh

 /bin/make-cert.pl

+%files pki

+%defattr(-,root,root)

+/etc/pki/tls/certs/ca-bundle.crt

 %changelog

+* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 20170406-2

+- Added -pki subpackage

 * Fri Apr 07 2017 Anish Swaminathan <anishs@vmware.com> 20170406-1

 - Updating mozilla certdata.txt to latest revision

 * Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 20160109-5

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

 Summary:        An URL retrieval utility and library

 Name:           curl

 Version:        7.51.0

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        MIT

 URL:            http://curl.haxx.se

 Group:          System Environment/NetworkingLibraries

@@ -17,6 +17,7 @@ Requires:       ca-certificates

 Requires:       openssl

 Requires:       krb5

 Requires:       libssh2

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

 %description

 The cURL package contains an utility and a library used for 

 transferring files with URL syntax to any of the following 

@@ -31,6 +32,13 @@ Requires:   %{name} = %{version}-%{release}

 %description devel

 Static libraries and header files for the support library for curl

+%package libs

+Summary: Libraries for curl

+Group:      System Environment/Libraries

+Requires:       ca-certificates-pki

+%description libs

+This package contains minimal set of shared curl libraries.

+

 %prep

 %setup -q

 sed -i '/--static-libs)/{N;s#echo .*#echo #;}' curl-config.in

@@ -66,7 +74,6 @@ rm -rf %{buildroot}/*

 %files

 %defattr(-,root,root)

 %{_bindir}/*

-%{_libdir}/*.so.*

 %{_mandir}/man1/*

 %files devel

@@ -78,8 +85,12 @@ rm -rf %{buildroot}/*

 %{_datarootdir}/aclocal/libcurl.m4

 %{_docdir}/%{name}-%{version}

+%files libs

+%{_libdir}/libcurl.so.*

 %changelog

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 7.51.0-5

+-   Added -libs subpackage

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 7.51.0-4

 -   Added -devel subpackage.

 *   Wed Nov 30 2016 Xiaolin Li <xiaolinl@vmware.com> 7.51.0-3

@@ -9,7 +9,7 @@ Source0:        http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar

 %define sha1    dbus=e0d10e8b4494383c7e366ac80a942ba45a705a96

 Vendor:         VMware, Inc.

 Distribution:   Photon

-BuildRequires:  expat

+BuildRequires:  expat-devel

 BuildRequires:  systemd-devel

 BuildRequires:  xz-devel

 Requires:       expat

@@ -21,6 +21,7 @@ The dbus package contains dbus.

 %package    devel

 Summary:    Header and development files

 Requires:   %{name} = %{version}

+Requires:  expat-devel

 %description    devel

 It contains the libraries and header files to create applications 

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

 Summary:	An XML parser library

 Name:		expat

 Version:	2.2.0

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	MIT

 URL:		http://expat.sourceforge.net/

 Group:		System Environment/GeneralLibraries

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

 Distribution:	Photon

 Source0:        https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.bz2

 %define sha1 expat=8453bc52324be4c796fd38742ec48470eef358b3

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

 %description

 The Expat package contains a stream oriented C library for parsing XML.

+

+%package    devel

+Summary:    Header and development files for expat

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

+%description    devel

+It contains the libraries and header files to create applications

+

+%package libs

+Summary: Libraries for expat

+Group:      System Environment/Libraries

+%description libs

+This package contains minimal set of shared expat libraries.

+

 %prep

 %setup -q

 %build

@@ -38,14 +52,22 @@ rm -rf %{buildroot}/*

 %files

 %defattr(-,root,root)

 %{_bindir}/*

-%{_libdir}/*.so*

-%{_libdir}/pkgconfig/*

-%{_includedir}/*

 %{_mandir}/man1/*

+

+%files devel

+%{_includedir}/*

+%{_libdir}/pkgconfig/*

+%{_libdir}/libexpat.so

+

+%files libs

+%{_libdir}/libexpat.so.*

+

 %changelog

-*       Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 2.2.0-1

--       Updating Source/Fixing CVE-2015-1283.

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

--	GA - Bump release of all rpms

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.0-1

--	Initial build.	First version

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.0-2

+-   Added -libs and -devel subpackages

+*   Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 2.2.0-1

+-   Updating Source/Fixing CVE-2015-1283.

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

+-   GA - Bump release of all rpms

+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.0-1

+-   Initial build.	First version

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

 Summary:	library for configuring and customizing font access.

 Name:		fontconfig

 Version:	2.12.1

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	BSD/GPL

 URL:		https://www.freedesktop.org/wiki/Software/fontconfig/

 Group:		System Environment/Libraries

@@ -12,7 +12,7 @@ Source0:	https://www.freedesktop.org/software/fontconfig/release/%{name}-%{versi

 Patch0:		0001-Avoid-conflicts-with-integer-width-macros-from-TS-18.patch

 BuildRequires:	freetype2-devel

 BuildRequires:	libxml2

-BuildRequires:	expat

+BuildRequires:	expat-devel

 Provides:	pkgconfig(fontconfig)

 %description

 Fontconfig can discover new fonts when installed automatically, removing a common source of configuration problems, perform font name substitution, so that appropriate alternative fonts can be selected if fonts are missing, identify the set of fonts required to completely cover a set of languages.

@@ -20,6 +20,7 @@ Fontconfig can discover new fonts when installed automatically, removing a commo

 %package	devel

 Summary:	Header and development files

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

+Requires:	expat-devel

 %description	devel

 It contains the libraries and header files to create applications 

@@ -67,5 +68,7 @@ make %{?_smp_mflags} -k check

 %{_mandir}/man3/*

 %changelog

-*       Fri Nov 11 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.12.1-1

--       Initial version

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.12.1-2

+-   Requires expat-devel

+*   Fri Nov 11 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.12.1-1

+-   Initial version

@@ -18,7 +18,7 @@ Distribution:	Photon

 Requires:	python2

 Requires:	expat

 Requires:	ncurses

-BuildRequires:	expat

+BuildRequires:	expat-devel

 BuildRequires:	ncurses-devel

 BuildRequires:	python2-devel

 BuildRequires:	python2-libs

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

 Summary:	Low-level libraries useful for providing data structure handling for C.

 Name:		glib

 Version:	2.52.1

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	LGPLv2+

 URL:		https://developer.gnome.org/glib/

 Group:		Applications/System

@@ -10,10 +10,10 @@ Distribution:	Photon

 Source0:	http://ftp.gnome.org/pub/gnome/sources/glib/2.52/%{name}-%{version}.tar.xz

 %define sha1 glib=ae55d5a476e7e9c08f06e22e9a723e4d0313a873

 BuildRequires:	pcre-devel

-BuildRequires:	libffi

+BuildRequires:	libffi-devel

 BuildRequires:	pkg-config

 BuildRequires:	cmake

-Requires:	pcre

+Requires:	pcre-libs

 Requires:	libffi

 Provides:	pkgconfig(glib-2.0)

 Provides:	pkgconfig(gmodule-2.0)

@@ -35,6 +35,7 @@ BuildRequires:	python2 >= 2.7

 BuildRequires:	python2-libs >= 2.7

 Requires:	pcre-devel

 Requires:	python2

+Requires:	libffi-devel

 %description devel

 Static libraries and header files for the support library for the glib library

@@ -87,23 +88,25 @@ make DESTDIR=%{buildroot} install

 %{_datadir}/glib-2.0/schemas/*

 %changelog

-*   Tue Apr 12 2017 Danut Moraru <dmoraru@vmware.com> 2.52.1-1

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.52.1-2

+-   Requires pcre-libs, BuildRequires libffi-devel.

+*   Wed Apr 12 2017 Danut Moraru <dmoraru@vmware.com> 2.52.1-1

 -   Updated to version 2.52.1-1

 *   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 2.48.2-2

 -   Modified %check

 *   Tue Sep 06 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.48.2-1

 -   Updated to version 2.48.2-1

-*	Thu Aug 11 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.47.6-3

--	Update glib require for devel to use the same version and release

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

--	GA - Bump release of all rpms

+*   Thu Aug 11 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.47.6-3

+-   Update glib require for devel to use the same version and release

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

+-   GA - Bump release of all rpms

 *   Thu Apr 14 2016	Harish Udaiya Kumar<hudaiyakumar@vmware.com> 2.47.6-1

     Updated to version 2.47.6

-* 	Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 2.46.2-1

+*   Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 2.46.2-1

 -   Updated to version 2.46.2

-*	Fri Jun 12 2015 Alexey Makhalov <amakhalov@vmware.com> 2.42.0-3

--	Added glib-schemas package

-*	Thu Jun 11 2015 Alexey Makhalov <amakhalov@vmware.com> 2.42.0-2

--	Added more 'Provides: pkgconfig(...)' for base package

-*	Thu Nov 06 2014 Sharath George <sharathg@vmware.com> 2.42.0-1

-	Initial version

+*   Fri Jun 12 2015 Alexey Makhalov <amakhalov@vmware.com> 2.42.0-3

+-   Added glib-schemas package

+*   Thu Jun 11 2015 Alexey Makhalov <amakhalov@vmware.com> 2.42.0-2

+-   Added more 'Provides: pkgconfig(...)' for base package

+*   Thu Nov 06 2014 Sharath George <sharathg@vmware.com> 2.42.0-1

+-   Initial version

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

 Summary:         Math libraries

 Name:            gmp

 Version:         6.1.2

-Release:         1%{?dist}

+Release:         2%{?dist}

 License:         LGPLv3+

 URL:             http://www.gnu.org/software/gmp

 Group:           Applications/System

@@ -16,29 +16,21 @@ for arbitrary precision arithmetic.

 %package    devel

 Summary:    Header and development files for gmp

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

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

 %description    devel

 It contains the libraries and header files to create applications

 for handling compiled objects.

 %prep

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

+%setup -q

 %build

-%ifarch i386 i486 i586 i686

-    ABI=32 ./configure \

-    --prefix=%{_prefix} \

-    --enable-cxx \

-    --disable-silent-rules \

-    --disable-assembly

-%else

     ./configure \

     --prefix=%{_prefix} \

-    --enable-cxx \

     --disable-silent-rules \

+    --disable-static \

     --disable-assembly

-%endif

 make %{?_smp_mflags}

 %install

@@ -57,31 +49,26 @@ make %{?_smp_mflags} check

 %files

 %defattr(-,root,root)

-%{_libdir}/libgmp.so.10

-%{_libdir}/libgmpxx.so.4.5.2

-%{_libdir}/libgmp.so.10.3.2

-%{_libdir}/libgmpxx.so.4

-%{_docdir}/%{name}-%{version}/tasks.html

-%{_docdir}/%{name}-%{version}/projects.html

-%{_docdir}/%{name}-%{version}/configuration

-%{_docdir}/%{name}-%{version}/isa_abi_headache

+%{_libdir}/libgmp.so.*

 %files devel

-%{_includedir}/gmpxx.h

 %{_includedir}/gmp.h

-%{_libdir}/libgmp.a

-%{_libdir}/libgmpxx.a

-%{_libdir}/libgmpxx.so

 %{_libdir}/libgmp.so

+%{_docdir}/%{name}-%{version}/tasks.html

+%{_docdir}/%{name}-%{version}/projects.html

+%{_docdir}/%{name}-%{version}/configuration

+%{_docdir}/%{name}-%{version}/isa_abi_headache

 %changelog

-*	Mon Apr 17 2017 Danut Moraru <dmoraru@vmware.com> 6.1.2-1

--	Update to 6.1.2

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

--	GA - Bump release of all rpms

-*    Thu Apr 14 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 6.0.0a-2

--    Disable assembly and use generic C code

-*    Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 6.0.0a-1

--    Updated to version 6.0.0

-*    Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.1.3-1

--    Initial build. First version

+*   Tue Apr 18 2017 Alexey Makhalov <amakhalov@vmware.com> 6.1.2-2

+-   Disable cxx (do not build libgmpxx). Disable static.

+*   Mon Apr 17 2017 Danut Moraru <dmoraru@vmware.com> 6.1.2-1

+-   Update to 6.1.2

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

+-   GA - Bump release of all rpms

+*   Thu Apr 14 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 6.0.0a-2

+-   Disable assembly and use generic C code

+*   Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 6.0.0a-1

+-   Updated to version 6.0.0

+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.1.3-1

+-   Initial build. First version

@@ -16,7 +16,7 @@ BuildRequires:  intltool

 BuildRequires:  flex

 BuildRequires:  bison

 BuildRequires:  glib-devel

-BuildRequires:  libffi

+BuildRequires:  libffi-devel

 BuildRequires:	go

 Requires:	libffi

 Requires:	glib

@@ -29,7 +29,7 @@ things.

 %package python

 Summary:    Python package for handling GObject introspection data

 Group:      Development/Languages

-Requires:   gobject-introspection

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

 BuildRequires:	python2-devel

 BuildRequires:	python2-libs

 BuildRequires:  python-xml

@@ -41,7 +41,8 @@ data from Python.

 %package devel

 Summary:    Libraries and headers for gobject-introspection

 Group:      Development/Libraries

-Requires:   gobject-introspection

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

+Requires:   libffi-devel

 Requires:   glib-devel

 Requires:   python2

 Requires:   python2-devel

@@ -12,7 +12,7 @@ Distribution:	Photon

 BuildRequires:	libltdl-devel

 BuildRequires:	libunistring-devel

 BuildRequires:	gc-devel

-BuildRequires:	libffi

+BuildRequires:	libffi-devel

 Requires:	libltdl

 Requires:	libunistring

 Requires:	gc

@@ -18,7 +18,7 @@ BuildRequires:  apr

 BuildRequires:  apr-util

 BuildRequires:  apr-util-devel

 BuildRequires:  openldap

-BuildRequires:  expat

+BuildRequires:  expat-devel

 BuildRequires:  lua-devel

 Requires:       pcre

 Requires:       apr-util

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

 Summary:		Libcap

 Name:			libcap

 Version:		2.25

-Release:		5%{?dist}

+Release:		6%{?dist}

 License:		GPLv2+

 URL:			https://www.gnu.org/software/hurd/community/gsoc/project_ideas/libcap.html

 Source0:		https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz

@@ -9,8 +9,6 @@ Source0:		https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{n

 Group:			System Environment/Security

 Vendor:			VMware, Inc.

 Distribution:	Photon

-Requires:		attr

-BuildRequires:	attr-devel

 %description

 The libcap package implements the user-space interfaces to the POSIX 1003.1e capabilities available 

 in Linux kernels. These capabilities are a partitioning of the all powerful root privilege 

@@ -46,12 +44,14 @@ cd progs

 %files devel

 %defattr(-,root,root)

 %{_includedir}/*

-%{_lib64dir}/libcap.a

+%exclude %{_lib64dir}/libcap.a

 %{_lib64dir}/pkgconfig/*

 %{_lib64dir}/libcap.so

 %{_mandir}/man3/*

 %changelog

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.25-6

+-   Remove attr deps.

 *   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 2.25-5

 -   Moved man3 to devel subpackage.

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2.25-4

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

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

 Name:		libffi

 Version:	3.2.1

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	BSD

 URL:		http://sourceware.org/libffi/

 Group:		System Environment/GeneralLibraries

@@ -20,6 +20,13 @@ Provides:	pkgconfig(libffi)

 The libffi library provides a portable, high level programming interface

 to various calling conventions. This allows a programmer to call any 

 function specified by a call interface description at run time.

+

+%package    devel

+Summary:    Header and development files for libffi

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

+%description    devel

+It contains the libraries and header files to create applications 

+

 %prep

 %setup -q

 tar xf %{SOURCE1} --no-same-owner

@@ -74,6 +81,7 @@ make %{?_smp_mflags} check

 %postun	-p /sbin/ldconfig

 %clean

 rm -rf %{buildroot}/*

+

 %files

 %defattr(-,root,root)

 %ifarch x86_64

@@ -81,16 +89,22 @@ rm -rf %{buildroot}/*

 %else

 %{_libdir}/*.so*

 %endif

+

+%files devel

+%defattr(-,root,root)

 %{_libdir}/pkgconfig/*

 %{_includedir}/*

 %{_datarootdir}/licenses/libffi/LICENSE

 %{_mandir}/man3/*

+

 %changelog

-*       Thu Oct 06 2016 ChangLee <changlee@vmware.com> 3.2.1-3

--       Modified %check

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

--	GA - Bump release of all rpms

-* 	Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 3.2.1-1

-- 	Updated to version 3.2.1

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.1-1

--	Initial build.	First version

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 3.2.1-4

+-   Added -devel subpackage

+*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 3.2.1-3

+-   Modified %check

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

+-   GA - Bump release of all rpms

+*   Fri Jan 15 2016 Xiaolin Li <xiaolinl@vmware.com> 3.2.1-1

+-   Updated to version 3.2.1

+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.1-1

+-   Initial build.	First version

@@ -21,7 +21,7 @@ BuildRequires:  rpm

 BuildRequires:	autoconf

 BuildRequires:	which

 BuildRequires:	pcre-devel

-BuildRequires:	libffi

+BuildRequires:	libffi-devel

 BuildRequires:	python2

 BuildRequires:	python2-libs

 BuildRequires:	gobject-introspection-devel

@@ -12,7 +12,6 @@ Distribution:	Photon

 BuildRequires:	gnutls-devel

 BuildRequires:	autogen

 Requires:	gnutls

-Requires:	gmp

 %description

 Librelp is an easy to use library for the RELP protocol. RELP (stands

 for Reliable Event Logging Protocol) is a general-purpose, extensible

@@ -5,7 +5,7 @@

 Summary:        Repodata downloading library

 Name:           librepo

 Version:        1.7.17

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/Tojaj/librepo/

 Group:          System Environment/Libraries

@@ -15,15 +15,15 @@ Source1:        pygpgme-0.3.tar.gz

 %define sha1    pygpgme=f8df35bd2705ac2e1642209fba732e6a42d03fd4

 Vendor:         VMware, Inc.

 Distribution:   Photon

-Requires:       curl, gpgme, libassuan, libgpg-error

-Requires:       expat

+Requires:       curl-libs, gpgme, libassuan, libgpg-error

+Requires:       expat-libs

 Requires:       glib

 Requires:       openssl

 BuildRequires:  cmake

 BuildRequires:  glib-devel

 BuildRequires:  check

-BuildRequires:  expat

+BuildRequires:  expat-devel

 BuildRequires:  curl-devel

 BuildRequires:  python2-devel

 BuildRequires:  python2-libs

@@ -38,10 +38,10 @@ linux repository metadata and packages

 %package devel

 Summary: package config and headers for librepo

-Requires: librepo

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

 Requires: curl-devel

+Requires: expat-devel

 Provides: pkgconfig(librepo)

-

 %description devel

 Package config and headers for librepo.

@@ -86,11 +86,13 @@ PYTHONPATH=`readlink -f ./librepo/python/python2/` nosetests -s -v tests/python/

 %{_includedir}/librepo/*.h

 %changelog

-*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.1-5

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 1.7.17-6

+-   Requires expat-libs, expat-devel and curl-libs.

+*   Wed Dec 07 2016 Xiaolin Li <xiaolinl@vmware.com> 1.7.17-5

 -   BuildRequires curl-devel.

-*   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.7.1-4

+*   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 1.7.17-4

 -   BuildRequired attr-devel.

-*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 1.7.1-3

+*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 1.7.17-3

 -   Modified %check

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

 -   GA - Bump release of all rpms

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

 Summary:        Libsolv-0.6.19

 Name:           libsolv

 Version:        0.6.26

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        BSD

 URL:            https://github.com/openSUSE/libsolv

 Source0:        https://github.com/openSUSE/libsolv/archive/%{name}-%{version}.tar.gz

@@ -10,11 +10,11 @@ Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Requires:       libdb

-Requires:       expat

+Requires:       expat-libs

 BuildRequires:  libdb-devel

 BuildRequires:  cmake

 BuildRequires:  rpm-devel

-BuildRequires:  expat

+BuildRequires:  expat-devel

 %description

 Libsolv is a free package management library, using SAT technology to solve requests. 

 It supports debian, rpm, archlinux and haiku style distributions.

@@ -22,7 +22,7 @@ It supports debian, rpm, archlinux and haiku style distributions.

 %package devel

 Summary:        Development headers for libsolv

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

-

+Requires:  expat-devel

 %description devel

 The libsolv-devel package contains libraries, header files and documentation

 for developing applications that use libsolv.

@@ -59,6 +59,8 @@ make %{?_smp_mflags} test

 %{_mandir}/man3/*

 %changelog

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.26-2

+-   Requires expat-libs and expat-devel.

 *   Tue Apr 04 2017 Kumar Kaushik <kaushikk@vmware.com>  0.6.26-1

 -   Upgrade to 0.6.26

 *   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 0.6.19-4

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

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

 Name:           llvm

 Version:        4.0.0

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        NCSA

 URL:            http://lldb.llvm.org

 Group:          Development/Tools

@@ -11,6 +11,7 @@ Source0:        http://releases.llvm.org/%{version}/%{name}-%{version}.src.tar.x

 %define sha1    llvm=aee4524e2407f9fe5afc6f70c753180b907011d0

 BuildRequires:  cmake

 BuildRequires:  libxml2-devel

+BuildRequires:  libffi-devel

 Requires:       libxml2

 %description

@@ -64,6 +65,8 @@ rm -rf %{buildroot}/*

 %{_includedir}/*

 %changelog

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

+-   BuildRequires libffi-devel

 *   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

@@ -14,6 +14,12 @@ Source0:	http://ftp.mozilla.org/pub/mozilla.org/%{name}/releases/v%{version}/src

 Netscape Portable Runtime (NSPR) provides a platform-neutral API

 for system level and libc like functions.

+%package    devel

+Summary:    Header and development files for nspr

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

+%description    devel

+It contains the libraries and header files to create applications

+

 %prep

 %setup -q

 cd nspr

@@ -42,22 +48,27 @@ make DESTDIR=%{buildroot} install

 %files

 %defattr(-,root,root)

+%{_libdir}/*.so

+

+%files devel

+%defattr(-,root,root)

 %{_bindir}/*

 %{_includedir}/*

-%{_libdir}/*.so

 %{_libdir}/pkgconfig/*.pc

 %{_datarootdir}/aclocal/*

 %changelog

-*	Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-1

--	Update to 4.14

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

--	GA - Bump release of all rpms

-*       Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 4.12-1

--       Updated to version 4.12

-* 	Thu Jan 21 2016 Xiaolin Li <xiaolinl@vmware.com> 4.11-1

-- 	Updated to version 4.11

-*	Fri May 29 2015 Alexey Makhalov <amakhalov@vmware.com> 4.10.8-1

--	Version update. Firefox requirement.

-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.10.3-1

--	Initial build. First version

+*   Sat Apr 15 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.14-1

+-   Update to 4.14

+*   Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 4.12-3