[rubygem-pg] Update to pg 0.14.1.
Vít Ondruch
vondruch at fedoraproject.org
Thu Mar 7 12:50:51 UTC 2013
commit d678e0629e0d3e3ccf3ba1cd127ed8d53c72a63e
Author: Vít Ondruch <vondruch at redhat.com>
Date: Thu Mar 7 13:29:52 2013 +0100
Update to pg 0.14.1.
.gitignore | 1 +
...32-Adding-some-fixes-for-PostgreSQL-9.2.x.patch | 46 ++++++++++++++++++++
rubygem-pg.spec | 37 ++++++++++------
sources | 2 +-
4 files changed, 72 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c0778f2..b79a5a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/pg-0.11.0.gem
/pg-0.12.2.gem
+/pg-0.14.1.gem
diff --git a/rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch b/rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch
new file mode 100644
index 0000000..42d6ed6
--- /dev/null
+++ b/rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Michael Granger <ged at FaerieMUD.org>
+# Date 1351634653 25200
+# Node ID 10804d14d1e7ccf9b265cd08a6e28853a1a60c66
+# Parent 994bad887ae9a963ef4cedf47aaa470da6a9e825
+Adding some fixes for PostgreSQL 9.2.x
+
+diff -r 994bad887ae9a963ef4cedf47aaa470da6a9e825 -r 10804d14d1e7ccf9b265cd08a6e28853a1a60c66 spec/lib/helpers.rb
+--- a/spec/lib/helpers.rb Tue Oct 30 15:03:28 2012 -0700
++++ b/spec/lib/helpers.rb Tue Oct 30 15:04:13 2012 -0700
+@@ -243,7 +243,10 @@
+
+ config.filter_run_excluding :postgresql_90 unless
+ PG::Connection.instance_methods.map( &:to_sym ).include?( :escape_literal )
+- config.filter_run_excluding :postgresql_91 unless
+- PG.respond_to?( :library_version )
++
++ unless PG.respond_to?( :library_version )
++ config.filter_run_excluding( :postgresql_91 )
++ config.filter_run_excluding( :postgresql_92 ) unless PG.library_version >= '90200'
++ end
+ end
+
+diff -r 994bad887ae9a963ef4cedf47aaa470da6a9e825 -r 10804d14d1e7ccf9b265cd08a6e28853a1a60c66 spec/pg/result_spec.rb
+--- a/spec/pg/result_spec.rb Tue Oct 30 15:03:28 2012 -0700
++++ b/spec/pg/result_spec.rb Tue Oct 30 15:04:13 2012 -0700
+@@ -71,7 +71,7 @@
+ result.error_field( PG::PG_DIAG_INTERNAL_QUERY ).should be_nil()
+ result.error_field( PG::PG_DIAG_CONTEXT ).should be_nil()
+ result.error_field( PG::PG_DIAG_SOURCE_FILE ).should =~ /parse_relation\.c$/
+- result.error_field( PG::PG_DIAG_SOURCE_LINE ).should == '857'
++ result.error_field( PG::PG_DIAG_SOURCE_LINE ).should =~ /^\d+$/
+ result.error_field( PG::PG_DIAG_SOURCE_FUNCTION ).should == 'parserOpenTable'
+
+ end
+@@ -127,8 +127,8 @@
+ out_bytes.should == in_bytes
+ end
+
+- it "should return the parameter type of the specified prepared statement parameter" do
+- query = 'SELECT * FROM pg_stat_activity WHERE user = $1::name AND current_query = $2::text'
++ it "should return the parameter type of the specified prepared statement parameter", :postgresql_92 do
++ query = 'SELECT * FROM pg_stat_activity WHERE user = $1::name AND query = $2::text'
+ @conn.prepare( 'queryfinder', query )
+ res = @conn.describe_prepared( 'queryfinder' )
+
diff --git a/rubygem-pg.spec b/rubygem-pg.spec
index c5bc806..beda06c 100644
--- a/rubygem-pg.spec
+++ b/rubygem-pg.spec
@@ -3,27 +3,26 @@
Summary: A Ruby interface to the PostgreSQL RDBMS
Name: rubygem-%{gem_name}
-Version: 0.12.2
-Release: 5%{?dist}
+Version: 0.14.1
+Release: 1%{?dist}
Group: Development/Languages
# 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: (GPLv2 or Ruby) and BSD
+License: (BSD or Ruby) and PostgreSQL
URL: http://bitbucket.org/ged/ruby-pg/
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Patch0: rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch
Requires: ruby(release)
Requires: ruby(rubygems)
-Requires: ruby
BuildRequires: ruby(release)
BuildRequires: ruby-devel
BuildRequires: rubygems-devel
BuildRequires: ruby
BuildRequires: postgresql-server postgresql-devel
-# Keep requiring rspec-core as long as rubygem(rspec) is provided by RSpec 1.x
-BuildRequires: rubygem(rspec-core)
+BuildRequires: rubygem(rspec)
# Introduced in F17.
Obsoletes: ruby(postgres) <= 0.7.9-2010.01.28.2
Provides: rubygem(%{gem_name}) = %{version}
@@ -47,6 +46,10 @@ Documentation for %{name}
%setup -q -c -T
%gem_install -n %{SOURCE0}
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
%build
%install
@@ -61,8 +64,16 @@ mv %{buildroot}%{gem_libdir}/pg_ext.so %{buildroot}%{gem_extdir_mri}/lib
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}/sample/check_conn.rb
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile.cross
+
sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_libdir}/pg.rb
-sed -i -e '/^#!rake/d' %{buildroot}%{gem_instdir}/Rakefile
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_libdir}/pg/constants.rb
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_libdir}/pg/result.rb
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_libdir}/pg/exceptions.rb
+sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_libdir}/pg/connection.rb
+
# Fix spec shebangs.
# https://bitbucket.org/ged/ruby-pg/issue/74/
@@ -81,8 +92,8 @@ popd
%exclude %{gem_instdir}/.gemtest
%{gem_extdir_mri}
%dir %{gem_instdir}
-%doc %{gem_instdir}/BSD
-%doc %{gem_instdir}/GPL
+%doc %{gem_instdir}/BSDL
+%doc %{gem_instdir}/POSTGRES
%doc %{gem_instdir}/LICENSE
%{gem_libdir}
%exclude %{gem_cache}
@@ -98,16 +109,16 @@ popd
%{gem_instdir}/Rakefile.cross
%doc %{gem_instdir}/README.rdoc
%doc %{gem_instdir}/README.ja.rdoc
-%doc %{gem_instdir}/README.OS_X.rdoc
-%doc %{gem_instdir}/README.windows.rdoc
-%{gem_instdir}/misc
+%doc %{gem_instdir}/README-OS_X.rdoc
+%doc %{gem_instdir}/README-Windows.rdoc
%{gem_instdir}/sample
%{gem_instdir}/spec
%changelog
-* Thu Mar 07 2013 Vít Ondruch <vondruch at redhat.com> - 0.12.2-5
+* Thu Mar 07 2013 Vít Ondruch <vondruch at redhat.com> - 0.14.1-1
- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Update to pg 0.14.1.
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index c857ef3..41363e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-765209bc586bb02a8814bd4342dd28f9 pg-0.12.2.gem
+1499fd3f3610e6e6b6a70296012b83ed pg-0.14.1.gem
More information about the scm-commits
mailing list