db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-04-23 11:58:50 +02:00
Code Issues Releases Activity

Update RHEL patch for upstream changes.

Browse Source 
This isn't correct, but we can't test anything else if the package doesn't build.
This commit is contained in:
David Steele 2019-08-09 14:52:26 -04:00
parent 0e7134d114
commit fe196cb0df
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/patch/rhel-package.patch
View File

@ -1,20 +1,34 @@
--- pgbackrest.spec --- pgbackrest.spec
+++ pgbackrest.spec +++ pgbackrest.spec
@@ -10,15 +10,14 @@ @@ -10,18 +10,14 @@
Source0: https://github.com/pgbackrest/pgbackrest/archive/release/%{version}.tar.gz Source0: https://github.com/pgbackrest/pgbackrest/archive/release/%{version}.tar.gz
Source1: pgbackrest-conf.patch Source1: pgbackrest-conf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: perl-XML-LibXML perl-IO-Socket-SSL -Requires: perl-XML-LibXML perl-IO-Socket-SSL
%if 0%{?rhel} && 0%{?rhel} <= 6 %if 0%{?rhel} && 0%{?rhel} <= 6
Requires: perl-parent perl-JSON perl-Time-HiRes -Requires: perl-parent perl-JSON perl-Time-HiRes
+Requires: perl-parent perl-JSON
%else %else
Requires: perl-JSON-PP Requires: perl-JSON-PP
%endif %endif
-Requires: perl-Digest-SHA perl-DBD-Pg perl-Time-HiRes zlib -Requires: perl-Digest-SHA perl-DBD-Pg perl-Time-HiRes zlib
+Requires: perl-Digest-SHA perl-Time-HiRes zlib libxml2 +Requires: perl-Time-HiRes openssl zlib libxml2 postgresql11-libs
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: openssl-devel zlib-devel perl-ExtUtils-Embed -BuildRequires: openssl-devel zlib-devel perl-ExtUtils-Embed
+BuildRequires: openssl-devel zlib-devel postgresql-libs perl-ExtUtils-Embed -BuildRequires: postgresql%{pgajorversion}-devel
-Requires: postgresql%{pgajorversion}-libs
-
+BuildRequires: openssl-devel zlib-devel perl-ExtUtils-Embed libxml2-devel postgresql11-devel
%description %description
pgBackRest aims to be a simple, reliable backup and restore system that can pgBackRest aims to be a simple, reliable backup and restore system that can
@@ -39,8 +35,7 @@
%build
pushd src
-export CPPFLAGS='-I %{pginstdir}/include'
-LDFLAGS='-L%{pginstdir}/lib' %configure
+LDFLAGS='-L/usr/pgsql-11/lib' PATH=$PATH:/usr/pgsql-11/bin %configure
%{__make}
popd

3
test/test.pl
View File

@ -1148,6 +1148,9 @@ eval
$oStorageBackRest->pathCreate("${strBuildPath}/RPMS", {bIgnoreExists => true, bCreateParent => true}); $oStorageBackRest->pathCreate("${strBuildPath}/RPMS", {bIgnoreExists => true, bCreateParent => true});
$oStorageBackRest->pathCreate("${strBuildPath}/BUILD", {bIgnoreExists => true, bCreateParent => true}); $oStorageBackRest->pathCreate("${strBuildPath}/BUILD", {bIgnoreExists => true, bCreateParent => true});
# Install PostreSQL 11 development for package builds
executeTest("docker exec -i test-build bash -c 'yum install -y postgresql11-devel 2>&1'");
# Copy source files # Copy source files
executeTest( executeTest(
"tar --transform='s_^_pgbackrest-release-${strVersionBase}/_'" . "tar --transform='s_^_pgbackrest-release-${strVersionBase}/_'" .