Compare commits
No commits in common. "imports/c8-beta-stream-3.1/rubygem-pg-1.3.2-1.module+el8.7.0+15125+b11ff321" and "c8-stream-2.7" have entirely different histories.
imports/c8
...
c8-stream-
|
@ -1,2 +1 @@
|
|||
SOURCES/pg-1.3.2-spec.tar.gz
|
||||
SOURCES/pg-1.3.2.gem
|
||||
SOURCES/pg-1.2.3.gem
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
ce5548f66a03a02fd779353bdc98a2617ab67e1d SOURCES/pg-1.3.2-spec.tar.gz
|
||||
2339c995e913b1d0d622cd271a0bb4fcf1fa5739 SOURCES/pg-1.3.2.gem
|
||||
8d6059a2769035768d7b9f2ac60e12eb3093b6fe SOURCES/pg-1.2.3.gem
|
||||
|
|
|
@ -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 @@
|
||||
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"
|
|
@ -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 @@
|
||||
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
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
%global gem_name pg
|
||||
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 1.3.2
|
||||
Version: 1.2.3
|
||||
Release: 1%{?dist}
|
||||
Summary: A Ruby interface to the PostgreSQL RDBMS
|
||||
# Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
|
||||
|
@ -13,16 +13,11 @@ 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-1.3.0-remove-rpath.patch
|
||||
# ext/pg_text_decoder.c
|
||||
Patch0: rubygem-pg-0.17.1-remove-rpath.patch
|
||||
# Required in 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
|
||||
|
@ -48,7 +43,7 @@ BuildArch: noarch
|
|||
Documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{gem_name}-%{version} -b 1
|
||||
%setup -q -n %{gem_name}-%{version}
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
|
@ -71,22 +66,18 @@ 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.
|
||||
|
@ -103,35 +94,28 @@ popd
|
|||
%files
|
||||
%dir %{gem_instdir}
|
||||
%{gem_extdir_mri}
|
||||
%exclude %{gem_instdir}/.*
|
||||
%exclude %{gem_instdir}/.gemtest
|
||||
%license %{gem_instdir}/BSDL
|
||||
%license %{gem_instdir}/LICENSE
|
||||
%license %{gem_instdir}/POSTGRES
|
||||
%license %{gem_instdir}/LICENSE
|
||||
%{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
|
||||
%lang(ja) %doc %{gem_instdir}/README.ja.rdoc
|
||||
%doc %{gem_instdir}/README.ja.rdoc
|
||||
%doc %{gem_instdir}/README.rdoc
|
||||
%{gem_instdir}/Rakefile*
|
||||
%{gem_instdir}/certs
|
||||
%{gem_instdir}/misc
|
||||
%{gem_instdir}/pg.gemspec
|
||||
%{gem_instdir}/sample
|
||||
%{gem_instdir}/spec
|
||||
|
||||
%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
|
||||
|
|
Loading…
Reference in New Issue