@@ -22,6 +22,7 @@ BuildRequires:	python2

 BuildRequires:	python2-libs

 BuildRequires:	dhcp-client

 BuildRequires:	libsoup-devel

+BuildRequires:  autogen

 Requires:		libnl

 Requires:		dbus-glib

 Requires:		glib

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

 Summary:	The Automated Text and Program Generation Tool

 Name:		autogen

 Version:	5.18.5

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:        GPLv3+

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

 Source0:        ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.gz

@@ -16,17 +16,28 @@ BuildRequires:	which

 Requires:	guile

 Requires:	gc

 Requires:	gmp

+Requires:   %{name}-libopts

 Distribution:	Photon

 %description

 AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text. It is especially valuable in programs that have several blocks of text that must be kept synchronized.

-%package devel

-Summary:	Development libraries and header files for autogen

-Requires:	autogen

+%package libopts

+Summary:	Automated option processing library.

+License:	LGPLv3+

+Group:		System Environment/Libraries

-%description devel

-The package contains libraries and header files for

-developing applications that use autogen.

+%description libopts

+Libopts is very powerful command line option parser. 

+

+%package libopts-devel

+Summary:	Development files for libopts

+License:	LGPLv3+

+Group:		Development/Libraries

+Requires:	%{name}

+Requires:	%{name}-libopts

+

+%description libopts-devel

+This package contains development files for libopts.

 %prep

 %setup -q

@@ -38,25 +49,38 @@ make %{?_smp_mflags}

 make DESTDIR=%{buildroot} install

 %check

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

-%post	-p /sbin/ldconfig

-%postun	-p /sbin/ldconfig

+

+%post	libopts -p /sbin/ldconfig

+%postun	libopts -p /sbin/ldconfig

+

 %files

 %defattr(-,root,root)

 %{_bindir}/*

-%{_libdir}/*.so.*

-%{_libdir}/*.a

-%{_libdir}/*.la

+%exclude %{_bindir}/autoopts-config

 %{_libdir}/autogen/*.tlib

 %{_datadir}/autogen/*

 %{_mandir}/man1/*

-%{_mandir}/man3/*

-%{_datadir}/aclocal/*

-%files devel

+%exclude %{_mandir}/man1/autoopts-config.1.gz

+

+

+%files libopts

+%{_libdir}/*.so.*

+

+%files libopts-devel

 %defattr(-,root,root)

 %{_includedir}/autoopts/*.h

 %{_libdir}/*.so

 %{_libdir}/pkgconfig/*.pc

+%{_bindir}/autoopts-config

+%{_datadir}/aclocal/*

+%{_mandir}/man1/autoopts-config.1.gz

+%{_mandir}/man3/*

+%{_libdir}/*.a

+%{_libdir}/*.la

+

 %changelog

+*   Tue Sep 29 2015 Xiaolin Li <xiaolinl@vmware.com> 5.18.5-2

+-   Create a seperate libopts package.

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

 -	Initial build. First version

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

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

 %define sha1 glib-networking=e6e17d1d6ed86a99db228fcf3ea1bd7f844a0cb5

 BuildRequires:	nettle-devel

-BuildRequires:	autogen-devel

+BuildRequires:	autogen-libopts-devel

 BuildRequires:	libtasn1-devel

 BuildRequires:	ca-certificates

 BuildRequires:  gnutls-devel

@@ -20,7 +20,7 @@ BuildRequires:  glib

 BuildRequires:  glib-devel

 BuildRequires:  glib-schemas

 Requires:	nettle

-Requires:	autogen

+#Requires:	autogen-libopts

 Requires:   gnutls

 Requires:	libtasn1

 Requires:	openssl

@@ -10,12 +10,12 @@ Group:		System Environment/Libraries

 Vendor:		VMware, Inc.

 Distribution:	Photon

 BuildRequires:	nettle-devel

-BuildRequires:	autogen-devel

+BuildRequires:	autogen-libopts-devel

 BuildRequires:	libtasn1-devel

 BuildRequires:	ca-certificates

 BuildRequires:	openssl-devel

 Requires:	nettle

-Requires:	autogen

+#Requires:	autogen-libopts

 Requires:	libtasn1

 Requires:	openssl

 Requires:	ca-certificates

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

 Summary:    The Apache HTTP Server

 Name:       httpd

 Version:    2.4.12

-Release:    2%{?dist}

+Release:    3%{?dist}

 License:    Apache License 2.0

 URL:        http://httpd.apache.org/

 Group:      Applications/System

@@ -38,6 +38,13 @@ Requires: httpd

 %description docs

 These are the help files of httpd.

+%package tools

+Group: System Environment/Daemons

+Summary: Tools for httpd

+

+%description tools

+The httpd-tools of httpd.

+

 %prep

 %setup -q

 %build

@@ -114,6 +121,8 @@ fi

 %defattr(-,root,root)

 %{_libdir}/*

 %{_bindir}/*

+%exclude %{_bindir}/apxs

+%exclude %{_bindir}/dbmmanage

 %{_sbindir}/*

 %{_datadir}/*

 %{_sysconfdir}/httpd/build/*

@@ -124,8 +133,14 @@ fi

 %{_sysconfdir}/httpd/icons/*

 %dir %{_sysconfdir}/httpd/logs

+%files tools

+%defattr(-,root,root)

+%{_bindir}/apxs

+%{_bindir}/dbmmanage

 %changelog

+*   Tue Sep 29 2015 Xiaolin Li <xiaolinl@vmware.com> 2.4.12-3

+-   Move perl script to tools package.

 *   Thu Jul 16 2015 Touseef Liaqat <tliaqat@vmware.com> 2.4.12-2

 -   Added service file. Changed installation paths.

 *   Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 2.4.12-1

@@ -10,6 +10,7 @@ Group:		System Environment/Libraries

 Vendor:		VMware, Inc.

 Distribution:	Photon

 BuildRequires:	gnutls-devel

+BuildRequires:	autogen

 Requires:	gnutls

 Requires:	gmp

 %description

@@ -19,6 +19,7 @@ BuildRequires:   python2-libs

 BuildRequires:   python2-devel

 BuildRequires:   python2-tools

 BuildRequires:   glib-networking

+BuildRequires:   autogen

 Requires:        libxml2

 Requires:        glib-networking

@@ -16,13 +16,14 @@ BuildRequires:	libgsystem

 BuildRequires:	xz-devel

 BuildRequires:	gtk-doc

 BuildRequires:	e2fsprogs-devel

+BuildRequires:  libsoup-devel

+BuildRequires:  autogen

 Requires:	libgsystem

 Requires:	gpgme

 Requires:	libassuan

 Requires:	libgpg-error

 Requires:   systemd

 Requires:   libsoup

-Requires:   libsoup-devel

 Requires:   mkinitcpio

 Requires:   dracut

 Requires:   dracut-tools

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

 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2

 %define sha1 postgresql=e295fee0f1bace740b2db1eaa64ac060e277d5a7

 Requires:	openssl

-Requires:	perl

 Requires: 	python2

 BuildRequires: 	perl

 BuildRequires:	python2

@@ -26,6 +26,7 @@ BuildRequires:	python2

 BuildRequires:	python2-libs

 BuildRequires:	gobject-introspection-devel

 BuildRequires:	gobject-introspection-python

+BuildRequires:  autogen

 Requires: 	systemd

 Requires: 	perl

 Requires:	gobject-introspection

@@ -32,6 +32,7 @@ BuildRequires:	attr

 BuildRequires: 	python2-libs

 BuildRequires:	python2

 BuildRequires: 	gobject-introspection-python

+BuildRequires:  autogen

 BuildRequires:	which

 BuildRequires:	popt-devel

@@ -15,6 +15,7 @@ BuildRequires:	json-c-devel

 BuildRequires:	libgcrypt-devel

 BuildRequires:	liblogging-devel

 BuildRequires:	librelp-devel

+BuildRequires:  autogen

 Requires:	systemd

 Requires:	libestr

 Requires:	json-c

@@ -2,7 +2,7 @@

     "packages":["google-daemon", "google-startup-scripts","autogen","cronie","gc","gnutls","guile",

 		"json-c","libestr","libgcrypt","liblogging","librelp","libtasn1","libunistring","nettle","rsyslog",

 		"device-mapper-multipath","NetworkManager","NetworkManager-devel","dbus-glib","libndp","libnl",

-		"dbus-glib-devel","libndp-devel","libnl-devel","logrotate","kpartx","autogen-devel","gc-devel",

+		"dbus-glib-devel","libndp-devel","libnl-devel","logrotate","kpartx","autogen-libopts", "autogen-libopts-devel","gc-devel",

 		"gnutls-devel","guile-devel","json-c-devel","libestr-devel","libgcrypt-devel","liblogging-devel",

 		"librelp-devel","libtasn1-devel","libunistring-devel","nettle-devel",

 	        "apache-ant","ant-contrib","apache-maven","apache-tomcat","jna","gnome-common","libgudev",

@@ -15,6 +15,8 @@

     "bootstrap_packages": ["filesystem"],

+    "documentation": false,

+

     "packages": ["glibc", "zlib", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp",

                 "pkg-config", "ncurses", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow",

                 "procps-ng", "iana-etc", "readline", "coreutils", "bc", "libtool", "inetutils",