From 4cb5f71169bc17d4398e181ac8ba8b1e71691c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 16 Jan 2015 15:05:34 +0100 Subject: [PATCH] Update to pg 0.18.1. --- .gitignore | 1 + rubygem-pg-0.17.1-remove-rpath.patch | 26 +++++++++++++------------- rubygem-pg.spec | 14 ++++++++++---- sources | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 7584a70..75fd58c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pg-0.12.2.gem /pg-0.14.1.gem /pg-0.17.1.gem +/pg-0.18.1.gem diff --git a/rubygem-pg-0.17.1-remove-rpath.patch b/rubygem-pg-0.17.1-remove-rpath.patch index d966be3..b52e604 100644 --- a/rubygem-pg-0.17.1-remove-rpath.patch +++ b/rubygem-pg-0.17.1-remove-rpath.patch @@ -1,17 +1,17 @@ diff --git a/ext/extconf.rb b/ext/extconf.rb --- a/ext/extconf.rb +++ b/ext/extconf.rb -@@ -32,13 +32,6 @@ - incdir = `"#{pgconfig}" --includedir`.chomp - libdir = `"#{pgconfig}" --libdir`.chomp - dir_config 'pg', incdir, libdir +@@ -29,13 +29,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" +- # 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" diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 3704ab8..b627515 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,8 +3,8 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} -Version: 0.17.1 -Release: 4%{?dist} +Version: 0.18.1 +Release: 1%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -38,7 +38,7 @@ Requires: %{name} = %{version}-%{release} BuildArch: noarch %description doc -Documentation for %{name} +Documentation for %{name}. %prep @@ -94,6 +94,11 @@ done %check pushd .%{gem_instdir} + +# The hostaddr support never get into Postgres 9.4. +# https://bitbucket.org/ged/ruby-pg/issue/202/hostaddr-with-postgres-94 +sed -i '/hostaddr/ s/^/#/' spec/pg/connection_spec.rb + rspec -I$(dirs +1)%{gem_extdir_mri} spec popd @@ -125,8 +130,9 @@ popd %changelog -* Fri Jan 16 2015 Vít Ondruch - 0.17.1-4 +* Fri Jan 16 2015 Vít Ondruch - 0.18.1-1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2 +- Update to pg 0.18.1. * Mon Aug 18 2014 Fedora Release Engineering - 0.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 9dc4679..d054b58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e81551ebe2d8504e99abcf29b243857 pg-0.17.1.gem +bc21aeb047b159ef68de2a84061e7f80 pg-0.18.1.gem