@@ -13,7 +13,7 @@ BuildArchitectures: x86_64

 Requires: 	bash

 Requires: 	libcap

 BuildRequires: 	cmake

-BuildRequires: 	libcap

+BuildRequires: 	libcap-devel

 BuildRequires: 	bzip2-devel

 %description

 The Cdrtools package contains CD recording utilities. These are useful for reading, creating or writing (burning) Compact Discs.

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

 Summary:	A utility for generating programs that recognize patterns in text

 Name:		flex

 Version:	2.5.38

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	BSD

 URL:		http://flex.sourceforge.net

 Group:		Applications/System

@@ -14,6 +14,16 @@ Requires:	m4

 %description

 The Flex package contains a utility for generating programs

 that recognize patterns in text.

+

+%package devel

+Summary: Development libraries and header files for the flex library

+Group: Development/Libraries

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

+

+%description devel

+The flex-devel package contains the development libraries and header files for

+flex.

+

 %prep

 %setup -q

 sed -i -e '/test-bison/d' tests/Makefile.in

@@ -46,12 +56,18 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_bindir}/flex++

 %attr(755,root,root) %{_bindir}/lex

 %{_libdir}/*.so.*

+%{_defaultdocdir}/%{name}-%{version}/*

+%{_mandir}/*/*

+

+%files devel

+%defattr(-,root,root)

 %{_libdir}/*.so

 %{_libdir}/*.a

 %{_includedir}/*

-%{_defaultdocdir}/%{name}-%{version}/*

-%{_mandir}/*/*

+

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 2.5.38-3

+-   Moving static lib files to devel package.

 *	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 2.5.38-2

 -	Adding m4 package to build and run time required package 

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

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

 Name:       	gobject-introspection

 Summary:    	Introspection system for GObject-based libraries

 Version:    	1.43.3

-Release:    	3%{?dist}

+Release:    	4%{?dist}

 Group:      	Development/Libraries

 License:    	GPLv2+, LGPLv2+, MIT

 URL:        	http://live.gnome.org/GObjectIntrospection

@@ -76,7 +76,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %files

 %defattr(-,root,root,-)

 %doc COPYING

-%{_libdir}/lib*

+%{_libdir}/lib*.so.*

 %dir %{_libdir}/girepository-1.0

 %{_libdir}/girepository-1.0/*.typelib

@@ -87,6 +87,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %files devel

 %defattr(-,root,root,-)

 %{_libdir}/lib*.so

+%{_libdir}/lib*.a

 %{_libdir}/pkgconfig/*

 %{_includedir}/*

 %{_bindir}/g-ir-*

@@ -96,6 +97,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %doc %{_mandir}/man1/*.gz

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 1.43.3-4

+-   Moving static lib files to devel package.

 *   Fri Oct 9 2015 Xiaolin Li <xiaolinl@vmware.com> 1.43.3-3

 -   Removing la files from packages.

 *	Mon Jul 6 2015 Alexey Makhalov <amakhalov@vmware.com> 1.43.3-2

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

 Summary:    Multi-format archive and compression library

 Name:       libarchive

 Version:    3.1.2

-Release:    4%{?dist}

+Release:    5%{?dist}

 License:    BSD 2-Clause License

 URL:        http://www.libarchive.org/

 Group:      System Environment/Development

@@ -42,15 +42,20 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %files

 %defattr(-,root,root)

-%{_libdir}

+%{_libdir}/*.so.*

 %{_bindir}

 %exclude %{_libdir}/debug/

 %files devel

 %defattr(-,root,root)

 %{_includedir}

 %{_mandir}

+%{_libdir}/*.so

+%{_libdir}/*.a

+%{_libdir}/pkgconfig/*.pc

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-5

+-   Moving static lib files to devel package.

 *   Fri Oct 9 2015 Xiaolin Li <xiaolinl@vmware.com> 3.1.2-4

 -   Removing la files from packages.

 *   Fri Aug 14 2015 Alexey Makhalov <amakhalov@vmware.com> 3.1.2-3

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

 Summary:	Libcap-2.24

 Name:		libcap

 Version:	2.24

-Release:	1%{?dist}

+Release:	2%{?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

@@ -15,6 +15,16 @@ BuildRequires:	attr

 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 

 into a set of distinct privileges.

+

+%package        devel

+Summary:        Development files for libcap

+Group:          Development/Libraries

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

+

+%description    devel

+The libcap-devel package contains libraries, header files and documentation

+for developing applications that use libcap.

+

 %prep

 %setup -q

 %build

@@ -27,11 +37,20 @@ chmod -v 755 %{buildroot}/usr/lib64/libcap.so

 make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %files

 %defattr(-,root,root)

-%{_lib64dir}/*

-%{_includedir}/*

+%{_lib64dir}/libcap.so.*

 %{_mandir}/man1/*

 %{_mandir}/man3/*

 %{_mandir}/man8/*

+

+%files devel

+%defattr(-,root,root)

+%{_includedir}/*

+%{_lib64dir}/libcap.a

+%{_lib64dir}/pkgconfig/*

+%{_lib64dir}/libcap.so

+

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 2.24-2

+-   Moving static lib files to devel package.

 *	Thu Oct 23 2014 Divya Thaluru <dthaluru@vmware.com> 2.24-1

 -	Initial version

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

 Summary:    libsoup HTTP client/server library

 Name:       libsoup

 Version:    2.50.0

-Release:    4%{?dist}

+Release:    5%{?dist}

 License:    GPLv2

 URL:        http://wiki.gnome.org/LibSoup

 Group:      System Environment/Development

@@ -68,11 +68,14 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %files

 %defattr(-,root,root)

-%{_libdir}

+%{_libdir}/*.so.*

 %exclude %{_libdir}/debug

 %files devel

 /usr/include/*

+%{_libdir}/*.so

+%{_libdir}/*.a

+%{_libdir}/pkgconfig/*

 %files doc

 /usr/share/*

@@ -81,6 +84,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete

 %defattr(-,root,root)

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 2.50.0-5

+-   Moving static lib files to devel package.

 *   Fri Oct 9 2015 Xiaolin Li <xiaolinl@vmware.com> 2.50.0-4

 -   Removing la files from packages.

 *   Mon Jul 20 2015 Divya Thaluru <dthaluru@vmware.com> 2.50.0-3

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

 Summary:	ASN.1 library

 Name:		libtasn1

 Version:	4.5

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv3+ and LGPLv2+

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

 Source0:	http://ftp.gnu.org/gnu/libtasn1/%{name}-%{version}.tar.gz

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

 %files

 %defattr(-,root,root)

 %{_libdir}/*.so.*

-%{_libdir}/*.a

 %{_bindir}/*

 %{_mandir}/man1/*

 %{_mandir}/man3/*

@@ -48,7 +47,10 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %{_includedir}/*.h

 %{_libdir}/*.so

 %{_libdir}/pkgconfig/*.pc

+%{_libdir}/*.a

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 4.5-3

+-   Moving static lib files to devel package.

 *   Fri Oct 9 2015 Xiaolin Li <xiaolinl@vmware.com> 4.5-2

 -   Removing la files from packages.

 *	Fri Jun 19 2015 Divya Thaluru <dthaluru@vmware.com> 4.5-1

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

 Summary:	Low level cryptographic libraries

 Name:		nettle

 Version:	3.1.1

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	LGPLv3+ or GPLv2+

 URL:            http://www.lysator.liu.se/~nisse/nettle/

 Source0: 	https://ftp.gnu.org/gnu/nettle/%{name}-%{version}.tar.gz

@@ -49,13 +49,15 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}

 %defattr(-,root,root)

 %{_libdir}/*.so.*

 %{_bindir}/*

-%{_libdir}/*.a

 %files devel

 %defattr(-,root,root)

 %{_includedir}/nettle/*.h

 %{_libdir}/*.so

 %{_libdir}/pkgconfig/*.pc

+%{_libdir}/*.a

 %changelog

+*   Mon Oct 12 2015 Xiaolin Li <xiaolinl@vmware.com> 3.1.1-2

+-   Moving static lib files to devel package.

 *	Thu Jun 18 2015 Divya Thaluru <dthaluru@vmware.com> 3.1.1-1

 -	Initial build. First version

@@ -13,7 +13,7 @@ Source1:	http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-201

 %define sha1 blfs-bootscripts=762b68f79f84463a6b1dabb69e9dbdc2c43f32d8

 Requires:	libcap >= 2.24

 BuildRequires:	which

-BuildRequires:	libcap

+BuildRequires:	libcap-devel

 Requires:	shadow

 %description

@@ -35,7 +35,7 @@ BuildRequires:	gobject-introspection

 BuildRequires:	gobject-introspection-devel

 BuildRequires:	gobject-introspection-python

 BuildRequires:  gpgme-devel

-BuildRequires:  libcap

+BuildRequires:  libcap-devel

 BuildRequires:  libsoup

 BuildRequires:  libsoup-devel

 BuildRequires:  mkinitcpio

@@ -17,7 +17,7 @@ BuildRequires: libtool

 BuildRequires: git

 BuildRequires: json-glib-devel

 BuildRequires: gtk-doc

-BuildRequires: libcap

+BuildRequires: libcap-devel

 BuildRequires: ostree-devel

 BuildRequires: libgsystem

 BuildRequires: docbook-xsl

@@ -16,7 +16,7 @@ Requires:	libcap

 Requires:	xz

 BuildRequires:	intltool

 BuildRequires:	gperf

-BuildRequires:	libcap

+BuildRequires:	libcap-devel

 BuildRequires:	xz-devel

 BuildRequires:	Linux-PAM

 BuildRequires:	XML-Parser

@@ -9,7 +9,7 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	https://security.appspot.com/downloads/%{name}-%{version}.tar.gz

 %define sha1 vsftpd=f36976bb1c5df25ac236d8a29e965ba2b825ccd0

-BuildRequires:	libcap Linux-PAM openssl-devel

+BuildRequires:	libcap-devel Linux-PAM openssl-devel

 Requires:	libcap Linux-PAM openssl

 %description

 Very secure and very small FTP daemon.

@@ -93,6 +93,10 @@ class ToolChainUtils(object):

                     if package == "util-linux-devel":

                         self.logger.info("No old verion of util-linux-devel exists, skip until the new version is built")

                         continue

+                    if package == "flex-devel":

+                        self.logger.info("No old verion of flex-devel exists, skip until the new version is built")

+                        continue

+

                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")

                     raise Exception("Input Error")

             rpmFiles += " " + rpmFile

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

                     if package == "util-linux-devel":

                         self.logger.info("No old verion of util-linux-devel exists, skip until the new version is built")

                         continue

+                    if package == "flex-devel":

+                        self.logger.info("No old verion of flex-devel exists, skip until the new version is built")

+                        continue

                     self.logger.error("Unable to find rpm "+ package +" in current and previous versions")

                     raise Exception("Input Error")

             rpmFiles += " " + rpmFile

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

     listToolChainPackages=["linux-api-headers", "glibc","zlib", "file",

         "binutils","gmp","mpfr", "mpc","gcc", "pkg-config", "ncurses", "bash", "bzip2", "sed","procps-ng","coreutils", "m4","grep",

         "readline", "diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch","util-linux", "util-linux-devel",

-        "tar", "xz","libtool", "flex",  "bison", "lua","popt","nspr","sqlite-autoconf","nss",

+        "tar", "xz","libtool", "flex",  "flex-devel","bison", "lua","popt","nspr","sqlite-autoconf","nss",

         "elfutils", "expat","libffi","libpipeline", "gdbm","perl","texinfo","autoconf","automake",

         "openssl","python2","rpm", "groff", "man-db", "man-pages","cpio"]

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

         "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

         "pkg-config", "ncurses", "bash", "bzip2", "sed","procps-ng","coreutils", "m4","grep",

         "readline","diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch",

-        "util-linux", "util-linux-devel", "tar", "xz","libtool", "flex",  "bison",

+        "util-linux", "util-linux-devel", "tar", "xz","libtool", "flex", "flex-devel",  "bison",

         "lua","popt","nspr","sqlite-autoconf","nss","elfutils-libelf",

         "libpipeline", "gdbm","perl","texinfo","rpm","rpm-build", "rpm-devel",

         "autoconf","automake", "groff", "man-db", "man-pages","elfutils","cpio"]

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

             "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

             "pkg-config", "ncurses", "bash", "bzip2", "sed","ncurses-devel","procps-ng","coreutils", "m4","grep",

             "readline", "diffutils","gawk", "findutils", "gettext", "gzip","make",  "patch",

-            "util-linux", "util-linux-devel", "tar", "xz","libtool", "flex",  "bison",

+            "util-linux", "util-linux-devel", "tar", "xz","libtool", "flex",  "flex-devel","bison",

             "readline-devel", "lua","lua-devel","popt","popt-devel","nspr","sqlite-autoconf","nss","nss-devel",

             "bzip2-devel","elfutils-libelf","elfutils","elfutils-libelf-devel","elfutils-devel",

             "expat","libffi","libpipeline", "gdbm","perl","texinfo","autoconf","automake",