Update to pg 1.1.4 by merging Fedora master branch (commit: 397796e)
Resolves: rhbz#1672575
This commit is contained in:
Jun Aruga
parent
14c5c5b32f
commit
6c37fcb6ac
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@
|
||||
/pg-0.20.0.gem
|
||||
/pg-0.21.0.gem
|
||||
/pg-1.0.0.gem
|
||||
/pg-1.1.4.gem
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
diff --git a/spec/helpers.rb b/spec/helpers.rb
|
||||
index 4362750..9b064ea 100755
|
||||
--- a/spec/helpers.rb
|
||||
+++ b/spec/helpers.rb
|
||||
@@ -199,8 +199,8 @@ module PG::TestingHelpers
|
||||
@test_pgdata = TEST_DIRECTORY + 'data'
|
||||
@test_pgdata.mkpath
|
||||
|
||||
- @port = 54321
|
||||
- ENV['PGPORT'] = @port.to_s
|
||||
+ ENV['PGPORT'] ||= "54321"
|
||||
+ @port = ENV['PGPORT'].to_i
|
||||
ENV['PGHOST'] = 'localhost'
|
||||
@conninfo = "host=localhost port=#{@port} dbname=test"
|
||||
|
||||
diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb
|
||||
index a1d7e42..1f6cd8d 100755
|
||||
--- a/spec/pg/connection_spec.rb
|
||||
+++ b/spec/pg/connection_spec.rb
|
||||
@@ -241,7 +241,7 @@ describe PG::Connection do
|
||||
expect( @conn.db ).to eq( "test" )
|
||||
expect( @conn.user ).to be_a_kind_of( String )
|
||||
expect( @conn.pass ).to eq( "" )
|
||||
- expect( @conn.port ).to eq( 54321 )
|
||||
+ expect( @conn.port ).to eq( @port )
|
||||
expect( @conn.tty ).to eq( "" )
|
||||
expect( @conn.options ).to eq( "" )
|
||||
end
|
||||
@@ -741,7 +741,7 @@ describe PG::Connection do
|
||||
it "can return the default connection options as a Hash" do
|
||||
expect( described_class.conndefaults_hash ).to be_a( Hash )
|
||||
expect( described_class.conndefaults_hash ).to include( :user, :password, :dbname, :host, :port )
|
||||
- expect( ['5432', '54321'] ).to include( described_class.conndefaults_hash[:port] )
|
||||
+ expect( ['5432', '54321', @port.to_s] ).to include( described_class.conndefaults_hash[:port] )
|
||||
expect( @conn.conndefaults_hash ).to eq( described_class.conndefaults_hash )
|
||||
end
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
%global gem_name pg
|
||||
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 1.0.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.1.4
|
||||
Release: 1%{?dist}
|
||||
Summary: A Ruby interface to the PostgreSQL RDBMS
|
||||
# Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
|
||||
#
|
||||
@ -16,9 +16,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||
# Disable RPATH.
|
||||
# https://bitbucket.org/ged/ruby-pg/issue/183
|
||||
Patch0: rubygem-pg-0.17.1-remove-rpath.patch
|
||||
# Add feature to set testing port.
|
||||
# https://github.com/ged/ruby-pg/commit/104ec67
|
||||
Patch1: rubygem-pg-1.1.4-add-feature-to-set-testing-port.patch
|
||||
# Required in ext/pg_text_decoder.c
|
||||
Requires: rubygem(bigdecimal)
|
||||
BuildRequires: ruby(release)
|
||||
BuildRequires: rubygems-devel
|
||||
BuildRequires: ruby-devel
|
||||
@ -26,7 +25,8 @@ BuildRequires: ruby-devel
|
||||
# https://fedoraproject.org/wiki/Packaging:C_and_C++#BuildRequires_and_Requires
|
||||
BuildRequires: gcc
|
||||
|
||||
BuildRequires: postgresql-server postgresql-devel
|
||||
BuildRequires: postgresql-server libpq-devel
|
||||
BuildRequires: rubygem(bigdecimal)
|
||||
BuildRequires: rubygem(rspec)
|
||||
|
||||
%description
|
||||
@ -43,10 +43,9 @@ BuildArch: noarch
|
||||
Documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{gem_name}-%{version}
|
||||
%setup -q -n %{gem_name}-%{version}
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
# Create the gem as gem install only works on a gem file
|
||||
@ -77,23 +76,19 @@ for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do
|
||||
&& chmod -v 644 $file
|
||||
done
|
||||
|
||||
# Fix spec shebangs.
|
||||
# https://bitbucket.org/ged/ruby-pg/issues/269/
|
||||
for file in `find %{buildroot}%{gem_instdir}/spec -type f -name "*.rb"`; do
|
||||
if [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ]; then
|
||||
sed -i '/^#!\/usr\/bin\/env/ d' $file
|
||||
chmod -v 644 $file
|
||||
fi
|
||||
done
|
||||
|
||||
%check
|
||||
pushd .%{gem_instdir}
|
||||
# Set --verbose to show detail log by $VERBOSE.
|
||||
# See https://github.com/ged/ruby-pg/blob/master/spec/helpers.rb $VERBOSE
|
||||
# Assign a random port to consider a case of multi builds in parallel in a host.
|
||||
# https://github.com/ged/ruby-pg/pull/39
|
||||
PGPORT="$((54321 + ${RANDOM} % 1000))" ruby -S --verbose \
|
||||
rspec -I$(dirs +1)%{gem_extdir_mri} -f d spec
|
||||
if ! PGPORT="$((54321 + ${RANDOM} % 1000))" ruby -S --verbose \
|
||||
rspec -I$(dirs +1)%{gem_extdir_mri} -f d spec; then
|
||||
echo "==== [setup.log start ] ===="
|
||||
cat tmp_test_specs/setup.log
|
||||
echo "==== [setup.log end ] ===="
|
||||
false
|
||||
fi
|
||||
popd
|
||||
|
||||
%files
|
||||
@ -121,6 +116,12 @@ popd
|
||||
%{gem_instdir}/spec
|
||||
|
||||
%changelog
|
||||
* Wed Jun 12 2019 Jun Aruga <jaruga@redhat.com> - 1.1.4-1
|
||||
- Update to pg 1.1.4 by merging Fedora master branch (commit: 397796e)
|
||||
* BuildRequires: s/postgresql-devel/libpq-devel/
|
||||
* Add marking lines at the start and end of the setup.log
|
||||
Resolves: rhbz#1672575
|
||||
|
||||
* Thu May 23 2019 Jun Aruga <jaruga@redhat.com> - 1.0.0-2
|
||||
- Assign a random testing port.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user