Change-Id: I99a3c6bc6469e3bc3008378d76f7718ba6c3fbf6
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3154
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: The Apache Portable Runtime Utility Library |
| 2 | 2 |
Name: apr-util |
| 3 | 3 |
Version: 1.5.4 |
| 4 |
-Release: 10%{?dist}
|
|
| 4 |
+Release: 11%{?dist}
|
|
| 5 | 5 |
License: Apache License 2.0 |
| 6 | 6 |
URL: https://apr.apache.org/ |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -47,7 +47,7 @@ This package provides the LDAP support for the apr-util. |
| 47 | 47 |
%package pgsql |
| 48 | 48 |
Group: Development/Libraries |
| 49 | 49 |
Summary: APR utility library PostgreSQL DBD driver |
| 50 |
-BuildRequires: postgresql |
|
| 50 |
+BuildRequires: postgresql-devel |
|
| 51 | 51 |
Requires: apr-util |
| 52 | 52 |
Requires: postgresql |
| 53 | 53 |
|
| ... | ... |
@@ -120,7 +120,9 @@ rm -rf $RPM_BUILD_ROOT |
| 120 | 120 |
%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite*
|
| 121 | 121 |
|
| 122 | 122 |
%changelog |
| 123 |
-* Wed May 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-10 |
|
| 123 |
+* Thu Jul 6 2017 Divya Thaluru <dthaluru@vmware.com> 1.5.4-11 |
|
| 124 |
+- Added build requires on postgresql-devel |
|
| 125 |
+* Wed May 10 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.5.4-10 |
|
| 124 | 126 |
- Add missing Requires. |
| 125 | 127 |
* Tue Apr 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.5.4-9 |
| 126 | 128 |
- Add expat-devel build deps otherwise it builds expat from its source tree |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: PostgreSQL database engine |
| 2 | 2 |
Name: postgresql |
| 3 | 3 |
Version: 9.6.3 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: PostgreSQL |
| 6 | 6 |
URL: www.postgresql.org |
| 7 | 7 |
Group: Applications/Databases |
| ... | ... |
@@ -42,6 +42,15 @@ PostgreSQL client program or interface. You will need to install this package |
| 42 | 42 |
to use any other PostgreSQL package or any clients that need to connect to a |
| 43 | 43 |
PostgreSQL server. |
| 44 | 44 |
|
| 45 |
+%package devel |
|
| 46 |
+Summary: Development files for postgresql. |
|
| 47 |
+Group: Development/Libraries |
|
| 48 |
+Requires: postgresql = %{version}-%{release}
|
|
| 49 |
+ |
|
| 50 |
+%description devel |
|
| 51 |
+The postgresql-devel package contains libraries and header files for |
|
| 52 |
+developing applications that use postgresql. |
|
| 53 |
+ |
|
| 45 | 54 |
%prep |
| 46 | 55 |
%setup -q |
| 47 | 56 |
%build |
| ... | ... |
@@ -97,16 +106,8 @@ rm -rf %{buildroot}/*
|
| 97 | 97 |
%{_bindir}/postmaster
|
| 98 | 98 |
%{_bindir}/vacuumlo
|
| 99 | 99 |
%{_datadir}/postgresql/*
|
| 100 |
-%{_libdir}/libpgcommon.a
|
|
| 101 |
-%{_libdir}/libpgfeutils.a
|
|
| 102 |
-%{_libdir}/libpgport.a
|
|
| 103 |
-%{_libdir}/libpq.a
|
|
| 104 | 100 |
%{_libdir}/postgresql/*
|
| 105 | 101 |
%{_docdir}/postgresql/extension/*.example
|
| 106 |
-%{_includedir}/postgresql/*
|
|
| 107 |
-%exclude %{_includedir}/postgresql/informix/*
|
|
| 108 |
-%exclude %{_includedir}/postgresql/internal/*
|
|
| 109 |
-%exclude %{_libdir}/debug/
|
|
| 110 | 102 |
%exclude %{_datadir}/postgresql/pg_service.conf.sample
|
| 111 | 103 |
%exclude %{_datadir}/postgresql/psqlrc.sample
|
| 112 | 104 |
|
| ... | ... |
@@ -127,39 +128,30 @@ rm -rf %{buildroot}/*
|
| 127 | 127 |
%{_bindir}/psql
|
| 128 | 128 |
%{_bindir}/reindexdb
|
| 129 | 129 |
%{_bindir}/vacuumdb
|
| 130 |
-%{_includedir}/ecpg_config.h
|
|
| 131 |
-%{_includedir}/ecpg_informix.h
|
|
| 132 |
-%{_includedir}/ecpgerrno.h
|
|
| 133 |
-%{_includedir}/ecpglib.h
|
|
| 134 |
-%{_includedir}/ecpgtype.h
|
|
| 135 |
-%{_includedir}/libpq-events.h
|
|
| 136 |
-%{_includedir}/libpq-fe.h
|
|
| 137 |
-%{_includedir}/libpq/libpq-fs.h
|
|
| 138 |
-%{_includedir}/pg_config.h
|
|
| 139 |
-%{_includedir}/pg_config_ext.h
|
|
| 140 |
-%{_includedir}/pg_config_manual.h
|
|
| 141 |
-%{_includedir}/pg_config_os.h
|
|
| 142 |
-%{_includedir}/pgtypes_date.h
|
|
| 143 |
-%{_includedir}/pgtypes_error.h
|
|
| 144 |
-%{_includedir}/pgtypes_interval.h
|
|
| 145 |
-%{_includedir}/pgtypes_numeric.h
|
|
| 146 |
-%{_includedir}/pgtypes_timestamp.h
|
|
| 147 |
-%{_includedir}/postgres_ext.h
|
|
| 148 |
-%{_includedir}/postgresql/informix/*
|
|
| 149 |
-%{_includedir}/postgresql/internal/*
|
|
| 150 |
-%{_includedir}/sql3types.h
|
|
| 151 |
-%{_includedir}/sqlca.h
|
|
| 152 |
-%{_includedir}/sqlda-compat.h
|
|
| 153 |
-%{_includedir}/sqlda-native.h
|
|
| 154 |
-%{_includedir}/sqlda.h
|
|
| 155 |
-%{_libdir}/libecpg*
|
|
| 156 |
-%{_libdir}/libpgtypes*
|
|
| 157 |
-%{_libdir}/libpq*
|
|
| 158 |
-%{_libdir}/pkgconfig/*
|
|
| 130 |
+%{_libdir}/libecpg*.so.*
|
|
| 131 |
+%{_libdir}/libpgtypes*.so.*
|
|
| 132 |
+%{_libdir}/libpq*.so.*
|
|
| 159 | 133 |
%{_datadir}/postgresql/pg_service.conf.sample
|
| 160 | 134 |
%{_datadir}/postgresql/psqlrc.sample
|
| 161 | 135 |
|
| 136 |
+%files devel |
|
| 137 |
+%defattr(-,root,root) |
|
| 138 |
+%{_includedir}/*
|
|
| 139 |
+%{_libdir}/pkgconfig/*
|
|
| 140 |
+%{_libdir}/libecpg*.so
|
|
| 141 |
+%{_libdir}/libpgtypes*.so
|
|
| 142 |
+%{_libdir}/libpq*.so
|
|
| 143 |
+%{_libdir}/libpgcommon.a
|
|
| 144 |
+%{_libdir}/libpgfeutils.a
|
|
| 145 |
+%{_libdir}/libpgport.a
|
|
| 146 |
+%{_libdir}/libpq.a
|
|
| 147 |
+%{_libdir}/libecpg.a
|
|
| 148 |
+%{_libdir}/libecpg_compat.a
|
|
| 149 |
+%{_libdir}/libpgtypes.a
|
|
| 150 |
+ |
|
| 162 | 151 |
%changelog |
| 152 |
+* Wed Jul 05 2017 Divya Thaluru <dthaluru@vmware.com> 9.6.3-2 |
|
| 153 |
+- Added postgresql-devel |
|
| 163 | 154 |
* Tue Jun 06 2017 Divya Thaluru <dthaluru@vmware.com> 9.6.3-1 |
| 164 | 155 |
- Upgraded to 9.6.3 |
| 165 | 156 |
* Mon Apr 03 2017 Rongrong Qiu <rqiu@vmware.com> 9.6.2-1 |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Python-PostgreSQL Database Adapter |
| 5 | 5 |
Name: python-psycopg2 |
| 6 | 6 |
Version: 2.7.1 |
| 7 |
-Release: 1%{?dist}
|
|
| 7 |
+Release: 2%{?dist}
|
|
| 8 | 8 |
Url: https://pypi.python.org/pypi/psycopg2 |
| 9 | 9 |
License: LGPL with exceptions or ZPL |
| 10 | 10 |
Group: Development/Languages/Python |
| ... | ... |
@@ -17,7 +17,7 @@ BuildRequires: python2 |
| 17 | 17 |
BuildRequires: python2-libs |
| 18 | 18 |
BuildRequires: python2-devel |
| 19 | 19 |
BuildRequires: python-setuptools |
| 20 |
-BuildRequires: postgresql |
|
| 20 |
+BuildRequires: postgresql-devel |
|
| 21 | 21 |
Requires: python2 |
| 22 | 22 |
Requires: python2-libs |
| 23 | 23 |
Requires: postgresql |
| ... | ... |
@@ -34,7 +34,7 @@ Summary: python-psycopg2 |
| 34 | 34 |
BuildRequires: python3 |
| 35 | 35 |
BuildRequires: python3-devel |
| 36 | 36 |
BuildRequires: python3-libs |
| 37 |
-BuildRequires: postgresql |
|
| 37 |
+BuildRequires: postgresql-devel |
|
| 38 | 38 |
Requires: python3 |
| 39 | 39 |
Requires: python3-libs |
| 40 | 40 |
Requires: postgresql |
| ... | ... |
@@ -74,5 +74,7 @@ popd |
| 74 | 74 |
%{python3_sitelib}/*
|
| 75 | 75 |
|
| 76 | 76 |
%changelog |
| 77 |
+* Thu Jul 6 2017 Divya Thaluru <dthaluru@vmware.com> 2.7.1-2 |
|
| 78 |
+- Added build requires on postgresql-devel |
|
| 77 | 79 |
* Wed Apr 26 2017 Xialin Li <xiaolinl@vmware.com> 2.7.1-1 |
| 78 | 80 |
- Initial packaging for Photon |