Upgrade to version 1.4.5

(cherry picked from commit edf568e3d31dc3b5a31c3f435a3236deaadd746d)
This commit is contained in:
wubijie 2023-08-10 10:31:12 +08:00 committed by openeuler-sync-bot
parent 6599390c52
commit 9f48a474bb
6 changed files with 40 additions and 40 deletions

Binary file not shown.

BIN
pg-1.4.5-spec.tar.gz Normal file

Binary file not shown.

BIN
pg-1.4.5.gem Normal file

Binary file not shown.

View File

@ -1,17 +0,0 @@
diff --git a/ext/extconf.rb b/ext/extconf.rb
--- a/ext/extconf.rb
+++ b/ext/extconf.rb
@@ -33,13 +33,6 @@
incdir = `"#{pgconfig}" --includedir`.chomp
libdir = `"#{pgconfig}" --libdir`.chomp
dir_config 'pg', incdir, libdir
-
- # Try to use runtime path linker option, even if RbConfig doesn't know about it.
- # The rpath option is usually set implicit by dir_config(), but so far not
- # on MacOS-X.
- if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
- $LDFLAGS << " -Wl,-rpath,#{libdir}"
- end
else
$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
" --with-pg-config=/path/to/pg_config"

View File

@ -0,0 +1,17 @@
diff --git a/ext/extconf.rb b/ext/extconf.rb
--- a/ext/extconf.rb
+++ b/ext/extconf.rb
@@ -52,13 +52,6 @@
else
incdir, libdir = dir_config 'pg'
dlldir = libdir
- end
-
- # Try to use runtime path linker option, even if RbConfig doesn't know about it.
- # The rpath option is usually set implicit by dir_config(), but so far not
- # on MacOS-X.
- if dlldir && RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
- append_ldflags "-Wl,-rpath,#{dlldir.quote}"
end
end

View File

@ -2,22 +2,22 @@
%global gem_name pg %global gem_name pg
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 1.2.3 Version: 1.4.5
Release: 1 Release: 1
Summary: A Ruby interface to the PostgreSQL RDBMS Summary: A Ruby interface to the PostgreSQL RDBMS
# Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
#
# The portions of the code that are BSD-licensed are licensed under
# the BSD 3-Clause license; the contents of the BSD file are incorrect.
#
License: (BSD or Ruby) and PostgreSQL License: (BSD or Ruby) and PostgreSQL
URL: https://github.com/ged/ruby-pg URL: https://github.com/ged/ruby-pg
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# git clone --no-checkout https://github.com/ged/ruby-pg.git
# git -C ruby-pg archive -v -o pg-1.4.5-spec.tar.gz v1.4.5 spec/
Source1: %{gem_name}-%{version}-spec.tar.gz
# Disable RPATH. # Disable RPATH.
# https://bitbucket.org/ged/ruby-pg/issue/183 # https://github.com/ged/ruby-pg/issues/183
Patch0: rubygem-pg-0.17.1-remove-rpath.patch Patch0: rubygem-pg-1.3.0-remove-rpath.patch
# Required in ext/pg_text_decoder.c # ext/pg_text_decoder.c
Requires: rubygem(bigdecimal) Requires: rubygem(bigdecimal)
# lib/pg/text_{de,en}coder.rb
Requires: rubygem(json)
BuildRequires: ruby(release) BuildRequires: ruby(release)
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
BuildRequires: ruby-devel BuildRequires: ruby-devel
@ -31,7 +31,7 @@ BuildRequires: rubygem(rspec)
%description %description
This is the extension library to access a PostgreSQL database from Ruby. This is the extension library to access a PostgreSQL database from Ruby.
This library works with PostgreSQL 9.1 and later. This library works with PostgreSQL 9.3 and later.
%package doc %package doc
@ -43,7 +43,7 @@ BuildArch: noarch
Documentation for %{name}. Documentation for %{name}.
%prep %prep
%setup -q -n %{gem_name}-%{version} %setup -q -n %{gem_name}-%{version} -b 1
%patch0 -p1 %patch0 -p1
@ -66,18 +66,11 @@ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}
# Prevent dangling symlink in -debuginfo (rhbz#878863). # Prevent dangling symlink in -debuginfo (rhbz#878863).
rm -rf %{buildroot}%{gem_instdir}/ext/ rm -rf %{buildroot}%{gem_instdir}/ext/
# Remove useless shebangs.
sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile
sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile.cross
# Files under %%{gem_libdir} are not executable.
for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do
sed -i '/^#!\/usr\/bin\/env/ d' $file \
&& chmod -v 644 $file
done
%check %check
pushd .%{gem_instdir} pushd .%{gem_instdir}
ln -s %{_builddir}/spec .
# Set --verbose to show detail log by $VERBOSE. # Set --verbose to show detail log by $VERBOSE.
# See https://github.com/ged/ruby-pg/blob/master/spec/helpers.rb $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. # Assign a random port to consider a case of multi builds in parallel in a host.
@ -94,7 +87,7 @@ popd
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
%{gem_extdir_mri} %{gem_extdir_mri}
%exclude %{gem_instdir}/.gemtest %exclude %{gem_instdir}/.*
%license %{gem_instdir}/BSDL %license %{gem_instdir}/BSDL
%license %{gem_instdir}/POSTGRES %license %{gem_instdir}/POSTGRES
%license %{gem_instdir}/LICENSE %license %{gem_instdir}/LICENSE
@ -104,8 +97,8 @@ popd
%files doc %files doc
%doc %{gem_docdir} %doc %{gem_docdir}
%doc %{gem_instdir}/ChangeLog
%doc %{gem_instdir}/Contributors.rdoc %doc %{gem_instdir}/Contributors.rdoc
%{gem_instdir}/Gemfile
%doc %{gem_instdir}/History.rdoc %doc %{gem_instdir}/History.rdoc
%doc %{gem_instdir}/Manifest.txt %doc %{gem_instdir}/Manifest.txt
%doc %{gem_instdir}/README-OS_X.rdoc %doc %{gem_instdir}/README-OS_X.rdoc
@ -113,8 +106,15 @@ popd
%doc %{gem_instdir}/README.ja.rdoc %doc %{gem_instdir}/README.ja.rdoc
%doc %{gem_instdir}/README.rdoc %doc %{gem_instdir}/README.rdoc
%{gem_instdir}/Rakefile* %{gem_instdir}/Rakefile*
%{gem_instdir}/spec %{gem_instdir}/rakelib/*
%{gem_instdir}/certs
%{gem_instdir}/misc
%{gem_instdir}/pg.gemspec
%{gem_instdir}/sample
%changelog %changelog
* Thu Aug 10 2023 wubijie <wubijie@kylinos.cn> - 1.4.5-1
- Upgrade to version 1.4.5
* Thu Mar 3 2022 caodongxia<caodongxia@huawei.com> - 1.2.3-1 * Thu Mar 3 2022 caodongxia<caodongxia@huawei.com> - 1.2.3-1
- Init package - Init package