Compare commits

...

No commits in common. "c8-stream-2.7" and "stream-ruby-3.1-rhel-8.9.0" have entirely different histories.

6 changed files with 59 additions and 20 deletions

5
.gitignore vendored
View File

@ -1 +1,4 @@
SOURCES/pg-1.2.3.gem
SOURCES/pg-1.3.2-spec.tar.gz
SOURCES/pg-1.3.2.gem
/pg-1.3.2-spec.tar.gz
/pg-1.3.2.gem

View File

@ -1 +1,2 @@
8d6059a2769035768d7b9f2ac60e12eb3093b6fe SOURCES/pg-1.2.3.gem
ce5548f66a03a02fd779353bdc98a2617ab67e1d pg-1.3.2-spec.tar.gz
2339c995e913b1d0d622cd271a0bb4fcf1fa5739 pg-1.3.2.gem

View File

@ -0,0 +1,17 @@
diff --git a/ext/extconf.rb b/ext/extconf.rb
--- a/ext/extconf.rb
+++ b/ext/extconf.rb
@@ -33,13 +33,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,7 +2,7 @@
%global gem_name pg
Name: rubygem-%{gem_name}
Version: 1.2.3
Version: 1.3.2
Release: 1%{?dist}
Summary: A Ruby interface to the PostgreSQL RDBMS
# Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
@ -13,11 +13,16 @@ Summary: A Ruby interface to the PostgreSQL RDBMS
License: (BSD or Ruby) and PostgreSQL
URL: https://github.com/ged/ruby-pg
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# git clone https://github.com/ged/ruby-pg.git && cd ruby-pg
# git archive -v -o pg-1.3.2-spec.tar.gz v1.3.2 spec/
Source1: %{gem_name}-%{version}-spec.tar.gz
# Disable RPATH.
# https://bitbucket.org/ged/ruby-pg/issue/183
Patch0: rubygem-pg-0.17.1-remove-rpath.patch
# Required in ext/pg_text_decoder.c
Patch0: rubygem-pg-1.3.0-remove-rpath.patch
# ext/pg_text_decoder.c
Requires: rubygem(bigdecimal)
# lib/pg/text_{de,en}coder.rb
Requires: rubygem(json)
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby-devel
@ -43,7 +48,7 @@ BuildArch: noarch
Documentation for %{name}.
%prep
%setup -q -n %{gem_name}-%{version}
%setup -q -n %{gem_name}-%{version} -b 1
%patch0 -p1
@ -66,18 +71,22 @@ cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}
# Prevent dangling symlink in -debuginfo (rhbz#878863).
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
pushd .%{gem_instdir}
ln -s %{_builddir}/spec .
# Test failures with disabled netwrok.
# https://github.com/ged/ruby-pg/issues/421
sed -i -r 's|\\d\+\\\.\\d\+\\\.\\d\+\\\.\\d\+|(\0)?|' spec/pg/connection_spec.rb
%ifarch ppc64le aarch64
# This test case should be ignored in theory, but it is not in practice:
# https://bugs.ruby-lang.org/issues/18560
# https://github.com/ged/ruby-pg/issues/423
mv spec/pg/gc_compact_spec.rb{,.disable}
%endif
# 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.
@ -94,28 +103,35 @@ popd
%files
%dir %{gem_instdir}
%{gem_extdir_mri}
%exclude %{gem_instdir}/.gemtest
%exclude %{gem_instdir}/.*
%license %{gem_instdir}/BSDL
%license %{gem_instdir}/POSTGRES
%license %{gem_instdir}/LICENSE
%license %{gem_instdir}/POSTGRES
%{gem_libdir}
%exclude %{gem_cache}
%{gem_spec}
%files doc
%doc %{gem_docdir}
%doc %{gem_instdir}/ChangeLog
%doc %{gem_instdir}/Contributors.rdoc
%{gem_instdir}/Gemfile
%doc %{gem_instdir}/History.rdoc
%doc %{gem_instdir}/Manifest.txt
%doc %{gem_instdir}/README-OS_X.rdoc
%doc %{gem_instdir}/README-Windows.rdoc
%doc %{gem_instdir}/README.ja.rdoc
%lang(ja) %doc %{gem_instdir}/README.ja.rdoc
%doc %{gem_instdir}/README.rdoc
%{gem_instdir}/Rakefile*
%{gem_instdir}/spec
%{gem_instdir}/certs
%{gem_instdir}/misc
%{gem_instdir}/pg.gemspec
%{gem_instdir}/sample
%changelog
* Mon May 02 2022 Jarek Prokop <jprokop@redhat.com> - 1.3.2-1
- Update to pg 1.3.2 by merging Fedora rawhide branch (commit: 39bbd1b)
Resolves: rhbz#2063772
* Fri May 29 2020 Jun Aruga <jaruga@redhat.com> - 1.2.3-1
- Update to pg 1.2.3 by merging Fedora master branch (commit: 5db4d26)
Resolves: rhbz#1817135

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (pg-1.3.2-spec.tar.gz) = c2b24de93fdd427b398580ce132d4fd956d4d10fb1983988feb1d36f7a90745973236c20a6265e34fee6d7f203b06289d4cfc04f0a1404b499ab3754fdc1eeb4
SHA512 (pg-1.3.2.gem) = bd7ffc7b5e0c652c4c7801732b8860164d6933e4c8b1deb173d4e0cbefeedb4dc6f2428ef44f96cc692f2739595eb94abbf7f5df4a35ba655830f55b6176f999