From d771a30254fcb819fa07ad6ab594d939861fb5aa452d885bdeb582851161bfdc Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 4 May 2016 02:46:52 +0000 Subject: [PATCH] - added pgbackrest-release-1.00_datadir.patch: perl libraries installed in the normal search path we dont need this anymore. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/pgbackrest?expand=0&rev=2 --- pgbackrest-release-1.00_datadir.patch | 192 ++++++++++++++++++++++++++ pgbackrest.changes | 7 + pgbackrest.spec | 10 +- 3 files changed, 205 insertions(+), 4 deletions(-) create mode 100644 pgbackrest-release-1.00_datadir.patch diff --git a/pgbackrest-release-1.00_datadir.patch b/pgbackrest-release-1.00_datadir.patch new file mode 100644 index 0000000..7ea46d2 --- /dev/null +++ b/pgbackrest-release-1.00_datadir.patch @@ -0,0 +1,192 @@ +Index: pgbackrest-release-1.00/bin/pgbackrest +=================================================================== +--- pgbackrest-release-1.00.orig/bin/pgbackrest ++++ pgbackrest-release-1.00/bin/pgbackrest +@@ -16,7 +16,6 @@ $SIG{__DIE__} = sub { Carp::confess @_ } + use File::Basename qw(dirname); + use Scalar::Util qw(blessed); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Archive; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Exit; +Index: pgbackrest-release-1.00/lib/pgBackRest/Common/Exit.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Common/Exit.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Common/Exit.pm +@@ -12,7 +12,6 @@ use Exporter qw(import); + use File::Basename qw(dirname); + use Scalar::Util qw(blessed); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Lock; + use pgBackRest::Common::Log; +Index: pgbackrest-release-1.00/lib/pgBackRest/Common/Lock.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Common/Lock.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Common/Lock.pm +@@ -12,7 +12,6 @@ use Exporter qw(import); + use Fcntl qw(:DEFAULT :flock); + use File::Basename qw(dirname); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Log; + use pgBackRest::Config::Config; +Index: pgbackrest-release-1.00/lib/pgBackRest/Common/Log.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Common/Log.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Common/Log.pm +@@ -15,7 +15,6 @@ use File::Basename qw(dirname); + use Scalar::Util qw(blessed reftype); + use Time::HiRes qw(gettimeofday usleep); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::String; + +Index: pgbackrest-release-1.00/lib/pgBackRest/Common/Wait.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Common/Wait.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Common/Wait.pm +@@ -14,7 +14,6 @@ use File::Basename qw(dirname); + use POSIX qw(ceil); + use Time::HiRes qw(gettimeofday usleep); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Log; + + #################################################################################################################################### +Index: pgbackrest-release-1.00/lib/pgBackRest/Config/Config.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Config/Config.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Config/Config.pm +@@ -13,7 +13,6 @@ use Exporter qw(import); + use File::Basename qw(dirname basename); + use Getopt::Long qw(GetOptions); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Ini; + use pgBackRest::Common::Log; +Index: pgbackrest-release-1.00/lib/pgBackRest/Config/ConfigHelp.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Config/ConfigHelp.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Config/ConfigHelp.pm +@@ -11,7 +11,6 @@ use Exporter qw(import); + our @EXPORT = qw(); + use File::Basename qw(dirname); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Ini; + use pgBackRest::Common::Log; +Index: pgbackrest-release-1.00/lib/pgBackRest/File.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/File.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/File.pm +@@ -17,7 +17,6 @@ use File::stat; + use IO::Handle; + use Scalar::Util qw(blessed); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Log; + use pgBackRest::Common::String; +Index: pgbackrest-release-1.00/lib/pgBackRest/FileCommon.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/FileCommon.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/FileCommon.pm +@@ -16,7 +16,6 @@ use File::Path qw(make_path); + use File::stat; + use IO::Handle; + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Log; + +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/Common.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/Common.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/Common.pm +@@ -12,7 +12,6 @@ use Exporter qw(import); + use Compress::Raw::Zlib qw(WANT_GZIP Z_OK Z_BUF_ERROR Z_STREAM_END); + use File::Basename qw(dirname); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Ini; + use pgBackRest::Common::Log; +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/CommonMaster.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/CommonMaster.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/CommonMaster.pm +@@ -11,7 +11,6 @@ use Carp qw(confess); + use File::Basename qw(dirname); + use Time::HiRes qw(gettimeofday); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Ini; + use pgBackRest::Common::Log; +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/CommonMinion.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/CommonMinion.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/CommonMinion.pm +@@ -11,7 +11,6 @@ use Carp qw(confess); + use File::Basename qw(dirname); + use Scalar::Util qw(blessed); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Ini; + use pgBackRest::Common::Log; +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/IO.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/IO.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/IO.pm +@@ -16,7 +16,6 @@ use POSIX qw(:sys_wait_h); + use Symbol 'gensym'; + use Time::HiRes qw(gettimeofday); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Log; + use pgBackRest::Common::String; +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/RemoteMaster.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/RemoteMaster.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/RemoteMaster.pm +@@ -10,7 +10,6 @@ use Carp qw(confess); + + use File::Basename qw(dirname); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Log; + use pgBackRest::Config::Config; + use pgBackRest::Protocol::CommonMaster; +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/RemoteMinion.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/RemoteMinion.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/RemoteMinion.pm +@@ -10,7 +10,6 @@ use Carp qw(confess); + + use File::Basename qw(dirname); + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Exception; + use pgBackRest::Common::Log; + use pgBackRest::Archive; +Index: pgbackrest-release-1.00/lib/pgBackRest/Protocol/ThreadGroup.pm +=================================================================== +--- pgbackrest-release-1.00.orig/lib/pgBackRest/Protocol/ThreadGroup.pm ++++ pgbackrest-release-1.00/lib/pgBackRest/Protocol/ThreadGroup.pm +@@ -12,7 +12,6 @@ use Exporter qw(import); + our @EXPORT = qw(); + use File::Basename; + +-use lib dirname($0) . '/../lib'; + use pgBackRest::Common::Log; + use pgBackRest::Common::Wait; + use pgBackRest::Config::Config; diff --git a/pgbackrest.changes b/pgbackrest.changes index 1be3301..635ce10 100644 --- a/pgbackrest.changes +++ b/pgbackrest.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 4 02:46:09 UTC 2016 - mrueckert@suse.de + +- added pgbackrest-release-1.00_datadir.patch: + perl libraries installed in the normal search path we dont need + this anymore. + ------------------------------------------------------------------- Wed May 4 02:26:45 UTC 2016 - mrueckert@suse.de diff --git a/pgbackrest.spec b/pgbackrest.spec index 1f0646e..978fc7c 100644 --- a/pgbackrest.spec +++ b/pgbackrest.spec @@ -23,6 +23,7 @@ Summary: Reliable PostgreSQL Backup & Restore Url: http://www.pgbackrest.org/ Group: Productivity/Databases/Tools Source: %{name}-release-%{version}.tar.gz +Patch: pgbackrest-release-1.00_datadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: perl @@ -40,16 +41,17 @@ are required to perform a backup which increases security. %prep %setup -q -n %{name}-release-%{version} +%patch -p1 %build %install -install -D -d -m 0755 %{buildroot}%{_datadir}/%{name} %{buildroot}%{_bindir} -cp -a bin lib %{buildroot}%{_datadir}/%{name} -ln -s %{_datadir}/%{name}/bin/%{name} %{buildroot}%{_bindir}/%{name} +install -D -d -m 0755 %{buildroot}%{perl_vendorlib} %{buildroot}%{_bindir} +cp -a lib/* %{buildroot}%{perl_vendorlib}/ +cp -a bin/%{name} %{buildroot}%{_bindir}/%{name} %files %defattr(-,root,root) %doc LICENSE README.md CHANGELOG.md %{_bindir}/%{name} -%{_datadir}/%{name} +%{perl_vendorlib}/pgBackRest/