@@ -1,22 +1,22 @@

-Summary:    The Apache Portable Runtime Utility Library

-Name:       apr-util

-Version:    1.5.4

-Release:    7%{?dist}

-License:    Apache License 2.0

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

-Group:      System Environment/Libraries

-Vendor:     VMware, Inc.

-Distribution: Photon

-Source0:    http://archive.apache.org/dist/apr/%{name}-%{version}.tar.gz

+Summary:        The Apache Portable Runtime Utility Library

+Name:           apr-util

+Version:        1.5.4

+Release:        8%{?dist}

+License:        Apache License 2.0

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

+Group:          System Environment/Libraries

+Vendor:         VMware, Inc.

+Distribution:   Photon

+Source0:        http://archive.apache.org/dist/apr/%{name}-%{version}.tar.gz

 %define sha1 apr-util=72cc3ac693b52fb831063d5c0de18723bc8e0095

-%define     apuver    1

-

-BuildRequires:   apr-devel

-BuildRequires:   openssl

-BuildRequires:   openssl-devel

-BuildRequires:   nss-devel

-Requires:   apr

-Requires:   openssl

+%define         apuver    1

+

+BuildRequires:  apr-devel

+BuildRequires:  openssl

+BuildRequires:  openssl-devel

+BuildRequires:  nss-devel

+Requires:       apr

+Requires:       openssl

 %description

 The Apache Portable Runtime Utility Library.

@@ -42,7 +42,7 @@ This package provides the LDAP support for the apr-util.

 %package pgsql

 Group: Development/Libraries

 Summary: APR utility library PostgreSQL DBD driver

-BuildRequires: postgresql

+BuildRequires: postgresql-devel

 Requires: apr-util

 Requires: postgresql

@@ -111,12 +111,14 @@ rm -rf $RPM_BUILD_ROOT

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

 %changelog

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

--	GA - Bump release of all rpms

+*   Thu Apr 13 2017 Xiaolin Li <xiaolinl@vmware.com> 1.5.4-8

+-   BuildRequires postgresql-devel.

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

+-   GA - Bump release of all rpms

 *   Wed Apr 13 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5.4-6

 -   remove libexpat files

-*	Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-5

--	Updated build-requires after creating devel package for apr. 

+*   Tue Sep 22 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-5

+-   Updated build-requires after creating devel package for apr. 

 *   Wed Sep 16 2015 Xiaolin Li <xiaolinl@vmware.com> 1.5.4-4

 -   Seperate Separate apr-util to apr-util, apr-util-devel, aprutil-ldap, apr-util-pgsql, and apr-utilsqlite.

 *   Wed Jul 15 2015 Sarah Choi <sarahc@vmware.com> 1.5.4-4

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

 Summary:        PostgreSQL database engine

 Name:           postgresql

 Version:        9.5.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        PostgreSQL

 URL:            www.postgresql.org

 Group:          Applications/Databases

@@ -44,6 +44,15 @@ PostgreSQL client program or interface. You will need to install this package

 to use any other PostgreSQL package or any clients that need to connect to a

 PostgreSQL server.

+%package        devel

+Summary:        Development files for postgresql.

+Group:          Development/Libraries

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

+

+%description    devel

+The postgresql-devel package contains libraries and header files for

+developing applications that use postgresql.

+

 %prep

 %setup -q

 %build

@@ -94,18 +103,11 @@ rm -rf %{buildroot}/*

 %{_bindir}/postgres

 %{_bindir}/postmaster

 %{_bindir}/vacuumlo

-%{_datadir}/postgresql/*

-%{_libdir}/libpgcommon.a

-%{_libdir}/libpgport.a

-%{_libdir}/libpq.a

 %{_libdir}/postgresql/*

 %{_docdir}/postgresql/extension/*.example

-%{_includedir}/postgresql/*

-%exclude %{_includedir}/postgresql/informix/*

-%exclude %{_includedir}/postgresql/internal/*

-%exclude %{_libdir}/debug/

 %exclude %{_datadir}/postgresql/pg_service.conf.sample

 %exclude %{_datadir}/postgresql/psqlrc.sample

+%{_datadir}/postgresql/*

 %files libs

 %{_bindir}/clusterdb

@@ -124,39 +126,28 @@ rm -rf %{buildroot}/*

 %{_bindir}/psql

 %{_bindir}/reindexdb

 %{_bindir}/vacuumdb

-%{_includedir}/ecpg_config.h

-%{_includedir}/ecpg_informix.h

-%{_includedir}/ecpgerrno.h

-%{_includedir}/ecpglib.h

-%{_includedir}/ecpgtype.h

-%{_includedir}/libpq-events.h

-%{_includedir}/libpq-fe.h

-%{_includedir}/libpq/libpq-fs.h

-%{_includedir}/pg_config.h

-%{_includedir}/pg_config_ext.h

-%{_includedir}/pg_config_manual.h

-%{_includedir}/pg_config_os.h

-%{_includedir}/pgtypes_date.h

-%{_includedir}/pgtypes_error.h

-%{_includedir}/pgtypes_interval.h

-%{_includedir}/pgtypes_numeric.h

-%{_includedir}/pgtypes_timestamp.h

-%{_includedir}/postgres_ext.h

-%{_includedir}/postgresql/informix/*

-%{_includedir}/postgresql/internal/*

-%{_includedir}/sql3types.h

-%{_includedir}/sqlca.h

-%{_includedir}/sqlda-compat.h

-%{_includedir}/sqlda-native.h

-%{_includedir}/sqlda.h

-%{_libdir}/libecpg*

-%{_libdir}/libpgtypes*

-%{_libdir}/libpq*

-%{_libdir}/pkgconfig/*

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

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

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

 %{_datadir}/postgresql/pg_service.conf.sample

 %{_datadir}/postgresql/psqlrc.sample

+%files devel

+%defattr(-,root,root)

+%{_includedir}/*

+%{_libdir}/pkgconfig/*

+%{_libdir}/libpgcommon.a

+%{_libdir}/libpgport.a

+%{_libdir}/libpq.a

+%{_libdir}/libecpg*.a

+%{_libdir}/libpgtypes*.a

+%{_libdir}/libecpg*.so

+%{_libdir}/libpgtypes*.so

+%{_libdir}/libpq*.so

+

 %changelog

+*   Thu Apr 13 2017 Xiaolin Li <xiaolinl@vmware.com> 9.5.4-2

+-   Added postgresql-devel.

 *   Wed Apr 05 2017 Xiaolin Li <xiaolinl@vmware.com> 9.5.4-1

 -   Updated to version 9.5.4.

 *   Thu Dec 15 2016 Xiaolin Li <xiaolinl@vmware.com> 9.5.3-4