From f4d158f2dfc33b763c837c7d671805b0b2b12b9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 2 Jun 2011 12:04:58 +0000 Subject: [PATCH 01/38] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 68f1407fa91ffb1cf0796c5c4938f9e392896603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 30 May 2011 10:11:41 +0200 Subject: [PATCH 02/38] Initial import (#708934). --- rubygem-pg.spec | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 2 files changed, 89 insertions(+) create mode 100644 rubygem-pg.spec diff --git a/rubygem-pg.spec b/rubygem-pg.spec new file mode 100644 index 0000000..04000c1 --- /dev/null +++ b/rubygem-pg.spec @@ -0,0 +1,88 @@ +# Generated from pg-0.11.0.gem by gem2rpm -*- rpm-spec -*- +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gemname pg +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global rubyabi 1.8 + +Summary: A Ruby interface to the PostgreSQL RDBMS +Name: rubygem-%{gemname} +Version: 0.11.0 +Release: 1%{?dist} +Group: Development/Languages +# License is not that clear: https://bitbucket.org/ged/ruby-pg/issue/72/ +License: (GPLv2 or Ruby) and BSD +URL: http://bitbucket.org/ged/ruby-pg/ +Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem +Requires: ruby(abi) = %{rubyabi} +Requires: rubygems +Requires: ruby +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: rubygems +BuildRequires: ruby ruby-devel +BuildRequires: postgresql-server postgresql-devel +# Keep requiring rspec-core as long as rubygem(rspec) is provided by RSpec 1.x +BuildRequires: rubygem(rspec-core) +Provides: rubygem(%{gemname}) = %{version} + +%description +This is the extension library to access a PostgreSQL database from Ruby. +This library works with PostgreSQL 7.4 and later. + + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires:%{name} = %{version}-%{release} + +%description doc +Documentation for %{name} + + +%prep +%setup -q -c -T +mkdir -p .%{gemdir} +gem install --local --install-dir .%{gemdir} \ + --force %{SOURCE0} + +%build + +%install +mkdir -p %{buildroot}%{gemdir} +cp -a .%{gemdir}/* \ + %{buildroot}%{gemdir}/ + +# Remove all build leftovers. +rm %{buildroot}%{geminstdir}/ext/*.{so,o,log} + +%check +pushd .%{geminstdir} +rspec spec +popd + +%files +%dir %{geminstdir} +%doc %{geminstdir}/BSD +%doc %{geminstdir}/GPL +%doc %{geminstdir}/LICENSE +%{geminstdir}/ext +%{geminstdir}/lib +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%files doc +%doc %{gemdir}/doc/%{gemname}-%{version} +%doc %{geminstdir}/ChangeLog +%doc %{geminstdir}/Contributors +%{geminstdir}/Rakefile +%{geminstdir}/Rakefile.local +%doc %{geminstdir}/README +%doc %{geminstdir}/README.ja +%doc %{geminstdir}/README.OS_X +%doc %{geminstdir}/README.windows +%{geminstdir}/rake +%{geminstdir}/spec + + +%changelog +* Thu May 26 2011 Vít Ondruch - 0.11.0-1 +- Initial package diff --git a/sources b/sources index e69de29..548688a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +6b49ebda17f0313aa2bab19b9f0f735d pg-0.11.0.gem From 3916c5aa6709aed7fadfb07d81723b256ac2447b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 31 May 2011 11:55:01 +0200 Subject: [PATCH 03/38] Removed/fixed shebang in non-executables. Removed sources. --- rubygem-pg.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 04000c1..95c5780 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -7,7 +7,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gemname} Version: 0.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # License is not that clear: https://bitbucket.org/ged/ruby-pg/issue/72/ License: (GPLv2 or Ruby) and BSD @@ -51,8 +51,21 @@ mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* \ %{buildroot}%{gemdir}/ -# Remove all build leftovers. -rm %{buildroot}%{geminstdir}/ext/*.{so,o,log} +# Remove the binary extension sources and build leftovers. +rm -rf %{buildroot}%{geminstdir}/ext + +# Remove useless shebangs. +sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{geminstdir}/lib/pg.rb +sed -i -e '/^#!rake/d' %{buildroot}%{geminstdir}/Rakefile +sed -i -e '/^#!rake/d' %{buildroot}%{geminstdir}/Rakefile.local + +# Fix spec shebangs. +# https://bitbucket.org/ged/ruby-pg/issue/74/ +for file in `find %{buildroot}%{geminstdir}/spec -type f ! -perm /a+x -name "*.rb"`; do + [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] \ + && sed -i -e 's/^#!\/usr\/bin\/env spec/#!\/usr\/bin\/env rspec/' $file \ + && chmod -v 755 $file +done %check pushd .%{geminstdir} @@ -64,7 +77,6 @@ popd %doc %{geminstdir}/BSD %doc %{geminstdir}/GPL %doc %{geminstdir}/LICENSE -%{geminstdir}/ext %{geminstdir}/lib %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec @@ -84,5 +96,9 @@ popd %changelog +* Mon May 30 2011 Vít Ondruch - 0.11.0-2 +- Removed/fixed shebang in non-executables. +- Removed sources. + * Thu May 26 2011 Vít Ondruch - 0.11.0-1 - Initial package From 3d804e924e502ff7b8d441f95e9e2a5c5c100a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 1 Jun 2011 16:03:45 +0200 Subject: [PATCH 04/38] Quoted upstredam license clarification. --- rubygem-pg.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 95c5780..a8b6d69 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -7,9 +7,13 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gemname} Version: 0.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages -# License is not that clear: https://bitbucket.org/ged/ruby-pg/issue/72/ +# 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 URL: http://bitbucket.org/ged/ruby-pg/ Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem @@ -96,6 +100,9 @@ popd %changelog +* Wed Jun 01 2011 Vít Ondruch - 0.11.0-3 +- Quoted upstredam license clarification. + * Mon May 30 2011 Vít Ondruch - 0.11.0-2 - Removed/fixed shebang in non-executables. - Removed sources. From fb8874fa9acf9b7914f8f1f2a0b79a174ae92dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 3 Jun 2011 16:39:49 +0200 Subject: [PATCH 05/38] Ignore source gem file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e69de29..23675e6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/pg-0.11.0.gem From 4e7965c15792aa4d71fda2ddfcb17f5d813ccf3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 3 Jun 2011 18:55:57 +0200 Subject: [PATCH 06/38] Binary extension moved into ruby_sitearch dir. -doc subpackage made architecture independent. --- rubygem-pg.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index a8b6d69..67b0248 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -2,12 +2,13 @@ %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemname pg %global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} %global rubyabi 1.8 Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gemname} Version: 0.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -36,7 +37,8 @@ This library works with PostgreSQL 7.4 and later. %package doc Summary: Documentation for %{name} Group: Documentation -Requires:%{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description doc Documentation for %{name} @@ -55,6 +57,9 @@ mkdir -p %{buildroot}%{gemdir} cp -a .%{gemdir}/* \ %{buildroot}%{gemdir}/ +install -d -m0755 %{buildroot}%{ruby_sitearch} +mv %{buildroot}%{geminstdir}/lib/pg_ext.so %{buildroot}%{ruby_sitearch}/ + # Remove the binary extension sources and build leftovers. rm -rf %{buildroot}%{geminstdir}/ext @@ -77,6 +82,7 @@ rspec spec popd %files +%{ruby_sitearch}/pg_ext.so %dir %{geminstdir} %doc %{geminstdir}/BSD %doc %{geminstdir}/GPL @@ -100,8 +106,12 @@ popd %changelog +* Fri Jun 03 2011 Vít Ondruch - 0.11.0-4 +- Binary extension moved into ruby_sitearch dir. +- -doc subpackage made architecture independent. + * Wed Jun 01 2011 Vít Ondruch - 0.11.0-3 -- Quoted upstredam license clarification. +- Quoted upstream license clarification. * Mon May 30 2011 Vít Ondruch - 0.11.0-2 - Removed/fixed shebang in non-executables. From f665bea1c464d304d1f6badddc3e05853611edb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 3 Jun 2011 19:26:15 +0200 Subject: [PATCH 07/38] Pass CFLAGS to extconf.rb. --- rubygem-pg.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 67b0248..6255fef 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -8,7 +8,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gemname} Version: 0.11.0 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -47,8 +47,9 @@ Documentation for %{name} %prep %setup -q -c -T mkdir -p .%{gemdir} +export CONFIGURE_ARGS="--with-cflags='%{optflags}'" gem install --local --install-dir .%{gemdir} \ - --force %{SOURCE0} + -V --force %{SOURCE0} %build @@ -106,6 +107,9 @@ popd %changelog +* Fri Jun 03 2011 Vít Ondruch - 0.11.0-5 +- Pass CFLAGS to extconf.rb. + * Fri Jun 03 2011 Vít Ondruch - 0.11.0-4 - Binary extension moved into ruby_sitearch dir. - -doc subpackage made architecture independent. From d4667558835c6fe60a7d9dd798a70928a58c6f6d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 21:19:08 -0600 Subject: [PATCH 08/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 6255fef..6b84b54 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -8,7 +8,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gemname} Version: 0.11.0 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -107,6 +107,9 @@ popd %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.11.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jun 03 2011 Vít Ondruch - 0.11.0-5 - Pass CFLAGS to extconf.rb. From c9cce211c1e9d548127b64ed2365087bc7ab9cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 24 Jan 2012 12:36:05 +0100 Subject: [PATCH 09/38] Rebuilt for Ruby 1.9.3. Upgrade to pg 0.12.2. --- .gitignore | 1 + rubygem-pg.spec | 95 ++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 23675e6..c0778f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pg-0.11.0.gem +/pg-0.12.2.gem diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 6b84b54..9943a37 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -1,14 +1,11 @@ # Generated from pg-0.11.0.gem by gem2rpm -*- rpm-spec -*- -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname pg -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} -%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} -%global rubyabi 1.8 +%global gem_name pg +%global rubyabi 1.9.1 Summary: A Ruby interface to the PostgreSQL RDBMS -Name: rubygem-%{gemname} -Version: 0.11.0 -Release: 6%{?dist} +Name: rubygem-%{gem_name} +Version: 0.12.2 +Release: 1%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -17,17 +14,18 @@ Group: Development/Languages # License: (GPLv2 or Ruby) and BSD URL: http://bitbucket.org/ged/ruby-pg/ -Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem +Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem Requires: ruby(abi) = %{rubyabi} -Requires: rubygems +Requires: ruby(rubygems) Requires: ruby BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: rubygems -BuildRequires: ruby ruby-devel +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) -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description This is the extension library to access a PostgreSQL database from Ruby. @@ -46,67 +44,74 @@ Documentation for %{name} %prep %setup -q -c -T -mkdir -p .%{gemdir} +mkdir -p .%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -gem install --local --install-dir .%{gemdir} \ +gem install --local --install-dir .%{gem_dir} \ -V --force %{SOURCE0} %build %install -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* \ - %{buildroot}%{gemdir}/ +mkdir -p %{buildroot}%{gem_dir} +mkdir -p %{buildroot}%{gem_extdir}/lib +cp -a .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ -install -d -m0755 %{buildroot}%{ruby_sitearch} -mv %{buildroot}%{geminstdir}/lib/pg_ext.so %{buildroot}%{ruby_sitearch}/ +mv %{buildroot}%{gem_libdir}/pg_ext.so %{buildroot}%{gem_extdir}/lib # Remove the binary extension sources and build leftovers. -rm -rf %{buildroot}%{geminstdir}/ext +rm -rf %{buildroot}%{gem_instdir}/ext # Remove useless shebangs. -sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{geminstdir}/lib/pg.rb -sed -i -e '/^#!rake/d' %{buildroot}%{geminstdir}/Rakefile -sed -i -e '/^#!rake/d' %{buildroot}%{geminstdir}/Rakefile.local +sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_libdir}/pg.rb +sed -i -e '/^#!rake/d' %{buildroot}%{gem_instdir}/Rakefile # Fix spec shebangs. # https://bitbucket.org/ged/ruby-pg/issue/74/ -for file in `find %{buildroot}%{geminstdir}/spec -type f ! -perm /a+x -name "*.rb"`; do +for file in `find %{buildroot}%{gem_instdir}/spec -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] \ && sed -i -e 's/^#!\/usr\/bin\/env spec/#!\/usr\/bin\/env rspec/' $file \ && chmod -v 755 $file done %check -pushd .%{geminstdir} +pushd .%{gem_instdir} rspec spec popd %files -%{ruby_sitearch}/pg_ext.so -%dir %{geminstdir} -%doc %{geminstdir}/BSD -%doc %{geminstdir}/GPL -%doc %{geminstdir}/LICENSE -%{geminstdir}/lib -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%exclude %{gem_instdir}/.gemtest +%{gem_extdir} +%dir %{gem_instdir} +%doc %{gem_instdir}/BSD +%doc %{gem_instdir}/GPL +%doc %{gem_instdir}/LICENSE +%{gem_libdir} +%exclude %{gem_cache} +%{gem_spec} %files doc -%doc %{gemdir}/doc/%{gemname}-%{version} -%doc %{geminstdir}/ChangeLog -%doc %{geminstdir}/Contributors -%{geminstdir}/Rakefile -%{geminstdir}/Rakefile.local -%doc %{geminstdir}/README -%doc %{geminstdir}/README.ja -%doc %{geminstdir}/README.OS_X -%doc %{geminstdir}/README.windows -%{geminstdir}/rake -%{geminstdir}/spec +%doc %{gem_docdir} +%doc %{gem_instdir}/ChangeLog +%doc %{gem_instdir}/Contributors.rdoc +%doc %{gem_instdir}/History.rdoc +%doc %{gem_instdir}/Manifest.txt +%{gem_instdir}/Rakefile +%{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 +%{gem_instdir}/sample +%{gem_instdir}/spec %changelog +* Tue Jan 24 2012 Vít Ondruch - 0.12.2-1 +- Rebuilt for Ruby 1.9.3. +- Upgrade to pg 0.12.2. + * Sat Jan 14 2012 Fedora Release Engineering - 0.11.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 548688a..c857ef3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b49ebda17f0313aa2bab19b9f0f735d pg-0.11.0.gem +765209bc586bb02a8814bd4342dd28f9 pg-0.12.2.gem From d089b3bc44d3ab710ed0ebee1a8e78f8f4a5303b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 7 Feb 2012 16:11:24 +0100 Subject: [PATCH 10/38] Obsolete ruby-postgress, which was retired. --- rubygem-pg.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 9943a37..4a76ced 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -5,7 +5,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -25,6 +25,8 @@ 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) +# Introduced in F17. +Obsoletes: ruby(postgres) <= 0.7.9-2010.01.28.2 Provides: rubygem(%{gem_name}) = %{version} %description @@ -108,6 +110,9 @@ popd %changelog +* Tue Feb 07 2012 Vít Ondruch - 0.12.2-2 +- Obsolete ruby-postgress, which was retired. + * Tue Jan 24 2012 Vít Ondruch - 0.12.2-1 - Rebuilt for Ruby 1.9.3. - Upgrade to pg 0.12.2. From 69d7abefc386f2c82b5ffec2be20a3f5492a0db2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 13:16:17 -0500 Subject: [PATCH 11/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 4a76ced..467df1d 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -5,7 +5,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.12.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -110,6 +110,9 @@ popd %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 0.12.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 07 2012 Vít Ondruch - 0.12.2-2 - Obsolete ruby-postgress, which was retired. From a65760e2a954c7639cba0cf30d4f71a7dbe52239 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 16:59:17 -0600 Subject: [PATCH 12/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 467df1d..97de729 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -5,7 +5,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.12.2 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -110,6 +110,9 @@ popd %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.12.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 0.12.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 39ab36ef45a49274fc4669c8039173f1ae10758c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 7 Mar 2013 11:45:20 +0100 Subject: [PATCH 13/38] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 --- rubygem-pg.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 97de729..c5bc806 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -1,11 +1,10 @@ # Generated from pg-0.11.0.gem by gem2rpm -*- rpm-spec -*- %global gem_name pg -%global rubyabi 1.9.1 Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.12.2 -Release: 4%{?dist} +Release: 5%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -15,10 +14,10 @@ Group: Development/Languages License: (GPLv2 or Ruby) and BSD URL: http://bitbucket.org/ged/ruby-pg/ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -Requires: ruby(abi) = %{rubyabi} +Requires: ruby(release) Requires: ruby(rubygems) Requires: ruby -BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems-devel BuildRequires: ruby @@ -46,20 +45,17 @@ Documentation for %{name} %prep %setup -q -c -T -mkdir -p .%{gem_dir} -export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -gem install --local --install-dir .%{gem_dir} \ - -V --force %{SOURCE0} +%gem_install -n %{SOURCE0} %build %install mkdir -p %{buildroot}%{gem_dir} -mkdir -p %{buildroot}%{gem_extdir}/lib +mkdir -p %{buildroot}%{gem_extdir_mri}/lib cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -mv %{buildroot}%{gem_libdir}/pg_ext.so %{buildroot}%{gem_extdir}/lib +mv %{buildroot}%{gem_libdir}/pg_ext.so %{buildroot}%{gem_extdir_mri}/lib # Remove the binary extension sources and build leftovers. rm -rf %{buildroot}%{gem_instdir}/ext @@ -83,7 +79,7 @@ popd %files %exclude %{gem_instdir}/.gemtest -%{gem_extdir} +%{gem_extdir_mri} %dir %{gem_instdir} %doc %{gem_instdir}/BSD %doc %{gem_instdir}/GPL @@ -110,6 +106,9 @@ popd %changelog +* Thu Mar 07 2013 Vít Ondruch - 0.12.2-5 +- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 + * Thu Feb 14 2013 Fedora Release Engineering - 0.12.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From d678e0629e0d3e3ccf3ba1cd127ed8d53c72a63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 7 Mar 2013 13:29:52 +0100 Subject: [PATCH 14/38] Update to pg 0.14.1. --- .gitignore | 1 + ...ding-some-fixes-for-PostgreSQL-9.2.x.patch | 46 +++++++++++++++++++ rubygem-pg.spec | 37 +++++++++------ sources | 2 +- 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch 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 +# 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 - 0.12.2-5 +* Thu Mar 07 2013 Vít Ondruch - 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 - 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 From f85286923399f28278fbe7c38a830c7dd323ebf3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 09:38:54 -0500 Subject: [PATCH 15/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index beda06c..a45265d 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -116,6 +116,9 @@ popd %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.14.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Mar 07 2013 Vít Ondruch - 0.14.1-1 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 - Update to pg 0.14.1. From aeb6375562728724b8e1ffe502b878ec2a48da13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 15 Apr 2014 10:35:36 +0200 Subject: [PATCH 16/38] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 --- rubygem-pg.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index a45265d..df5d215 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.14.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -15,8 +15,6 @@ 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) BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems-devel @@ -25,7 +23,6 @@ BuildRequires: postgresql-server postgresql-devel BuildRequires: rubygem(rspec) # Introduced in F17. Obsoletes: ruby(postgres) <= 0.7.9-2010.01.28.2 -Provides: rubygem(%{gem_name}) = %{version} %description This is the extension library to access a PostgreSQL database from Ruby. @@ -54,11 +51,11 @@ popd %install mkdir -p %{buildroot}%{gem_dir} -mkdir -p %{buildroot}%{gem_extdir_mri}/lib +mkdir -p %{buildroot}%{gem_extdir_mri} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -mv %{buildroot}%{gem_libdir}/pg_ext.so %{buildroot}%{gem_extdir_mri}/lib +cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ # Remove the binary extension sources and build leftovers. rm -rf %{buildroot}%{gem_instdir}/ext @@ -85,7 +82,7 @@ done %check pushd .%{gem_instdir} -rspec spec +rspec -I$(dirs +1)%{gem_extdir_mri} spec popd %files @@ -116,6 +113,9 @@ popd %changelog +* Tue Apr 15 2014 Vít Ondruch - 0.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + * Sun Aug 04 2013 Fedora Release Engineering - 0.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a500de03fdcdb3c074132d7d56eb937fa1f9f743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 15 Apr 2014 15:58:39 +0200 Subject: [PATCH 17/38] Update to pg 0.17.1. --- .gitignore | 1 + ...ding-some-fixes-for-PostgreSQL-9.2.x.patch | 46 ------------------- rubygem-pg-0.17.1-remove-rpath.patch | 17 +++++++ rubygem-pg.spec | 41 +++++++++++------ sources | 2 +- 5 files changed, 46 insertions(+), 61 deletions(-) delete mode 100644 rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch create mode 100644 rubygem-pg-0.17.1-remove-rpath.patch diff --git a/.gitignore b/.gitignore index b79a5a3..7584a70 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pg-0.11.0.gem /pg-0.12.2.gem /pg-0.14.1.gem +/pg-0.17.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 deleted file mode 100644 index 42d6ed6..0000000 --- a/rubygem-pg-0.15.0.pre.432-Adding-some-fixes-for-PostgreSQL-9.2.x.patch +++ /dev/null @@ -1,46 +0,0 @@ -# HG changeset patch -# User Michael Granger -# 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-0.17.1-remove-rpath.patch b/rubygem-pg-0.17.1-remove-rpath.patch new file mode 100644 index 0000000..d966be3 --- /dev/null +++ b/rubygem-pg-0.17.1-remove-rpath.patch @@ -0,0 +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 +- +- # 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 df5d215..1613fc8 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.14.1 -Release: 3%{?dist} +Version: 0.17.1 +Release: 1%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -14,7 +14,9 @@ Group: Development/Languages 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 +# Disable RPATH. +# https://bitbucket.org/ged/ruby-pg/issue/183 +Patch0: rubygem-pg-0.17.1-remove-rpath.patch BuildRequires: ruby(release) BuildRequires: ruby-devel BuildRequires: rubygems-devel @@ -40,14 +42,20 @@ Documentation for %{name} %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} +gem unpack %{SOURCE0} +%setup -q -D -T -n %{gem_name}-%{version} + +gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -pushd .%{gem_instdir} %patch0 -p1 -popd %build +# Create the gem as gem install only works on a gem file +gem build %{gem_name}.gemspec + +# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir +# by default, so that we can move it into the buildroot in %%install +%gem_install %install mkdir -p %{buildroot}%{gem_dir} @@ -62,15 +70,19 @@ 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 '/^#!\/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 +# 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 +# Fix shebangs and executable bits of samples. +for file in `find %{buildroot}%{gem_instdir}/sample -type f -name "*.rb"`; do + sed -i -e 's/^#!\/usr\/bin\/env spec/#!\/usr\/bin\/ruby/' $file \ + && chmod -v 755 $file +done # Fix spec shebangs. # https://bitbucket.org/ged/ruby-pg/issue/74/ @@ -113,8 +125,9 @@ popd %changelog -* Tue Apr 15 2014 Vít Ondruch - 0.14.1-3 +* Tue Apr 15 2014 Vít Ondruch - 0.17.1-1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 +- Update to pg 0.17.1. * Sun Aug 04 2013 Fedora Release Engineering - 0.14.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 41363e7..9dc4679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1499fd3f3610e6e6b6a70296012b83ed pg-0.14.1.gem +0e81551ebe2d8504e99abcf29b243857 pg-0.17.1.gem From caf1b2a48d70e48df32ff50903d4dc7d5d4d5daf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:59:35 -0500 Subject: [PATCH 18/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 1613fc8..704fada 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Apr 15 2014 Vít Ondruch - 0.17.1-1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 - Update to pg 0.17.1. From bc0841ff2c3a43ff4dd14ce6fc6a8708f187fcb3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 00:52:26 +0000 Subject: [PATCH 19/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 704fada..0ee5361 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.17.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.17.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 0.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1da26a0e54a3361989e4a213bb3ac3ec8e7446df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 16 Jan 2015 13:55:35 +0100 Subject: [PATCH 20/38] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2 --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 0ee5361..3704ab8 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.17.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %changelog +* Fri Jan 16 2015 Vít Ondruch - 0.17.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2 + * Mon Aug 18 2014 Fedora Release Engineering - 0.17.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 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 21/38] 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 From ab4c5a68a641d9461d0ed3d39f6eb7bc6a227a54 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 23:36:28 +0000 Subject: [PATCH 22/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index b627515..911fc35 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -130,6 +130,9 @@ popd %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 0.18.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * 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. From 4a40f92cf0f494c937141c4085cbded7d1438b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 26 Aug 2015 16:51:55 +0200 Subject: [PATCH 23/38] Update to pg 1.18.2. --- .gitignore | 1 + rubygem-pg.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 75fd58c..a7f4489 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pg-0.14.1.gem /pg-0.17.1.gem /pg-0.18.1.gem +/pg-0.18.2.gem diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 911fc35..0623444 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.18.1 -Release: 2%{?dist} +Version: 0.18.2 +Release: 1%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -80,7 +80,7 @@ done # Fix shebangs and executable bits of samples. for file in `find %{buildroot}%{gem_instdir}/sample -type f -name "*.rb"`; do - sed -i -e 's/^#!\/usr\/bin\/env spec/#!\/usr\/bin\/ruby/' $file \ + sed -i -e '/^#!\/usr\/bin\/env/ s/.*/#!\/usr\/bin\/ruby/' $file \ && chmod -v 755 $file done @@ -94,11 +94,6 @@ 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 @@ -130,6 +125,9 @@ popd %changelog +* Wed Aug 26 2015 Vít Ondruch - 0.18.2-1 +- Update to pg 1.18.2. + * Thu Jun 18 2015 Fedora Release Engineering - 0.18.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index d054b58..565072a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc21aeb047b159ef68de2a84061e7f80 pg-0.18.1.gem +8a963b46ddc65141c3a863b891e91449 pg-0.18.2.gem From 1f3dd4a9fe6474d4f16243b23916ec695d1299e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 6 Jan 2016 17:29:34 +0100 Subject: [PATCH 24/38] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 0623444..0bed4a7 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %changelog +* Wed Jan 06 2016 Vít Ondruch - 0.18.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 + * Wed Aug 26 2015 Vít Ondruch - 0.18.2-1 - Update to pg 1.18.2. From 7724b6371aeef151fec83ca174c215d4b18dd176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 6 Jan 2016 18:14:33 +0100 Subject: [PATCH 25/38] Update to pg 1.18.4. --- .gitignore | 1 + rubygem-pg.spec | 42 ++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index a7f4489..cfa06f1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pg-0.17.1.gem /pg-0.18.1.gem /pg-0.18.2.gem +/pg-0.18.4.gem diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 0bed4a7..aeb0758 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.18.2 -Release: 2%{?dist} +Version: 0.18.4 +Release: 1%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -12,19 +12,17 @@ Group: Development/Languages # the BSD 3-Clause license; the contents of the BSD file are incorrect. # License: (BSD or Ruby) and PostgreSQL -URL: http://bitbucket.org/ged/ruby-pg/ -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +URL: https://bitbucket.org/ged/ruby-pg +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Disable RPATH. # https://bitbucket.org/ged/ruby-pg/issue/183 Patch0: rubygem-pg-0.17.1-remove-rpath.patch BuildRequires: ruby(release) -BuildRequires: ruby-devel BuildRequires: rubygems-devel -BuildRequires: ruby +BuildRequires: ruby-devel + BuildRequires: postgresql-server postgresql-devel BuildRequires: rubygem(rspec) -# Introduced in F17. -Obsoletes: ruby(postgres) <= 0.7.9-2010.01.28.2 %description This is the extension library to access a PostgreSQL database from Ruby. @@ -59,14 +57,14 @@ gem build %{gem_name}.gemspec %install mkdir -p %{buildroot}%{gem_dir} -mkdir -p %{buildroot}%{gem_extdir_mri} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ +mkdir -p %{buildroot}%{gem_extdir_mri} cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/ -# Remove the binary extension sources and build leftovers. -rm -rf %{buildroot}%{gem_instdir}/ext +# 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 @@ -98,12 +96,12 @@ rspec -I$(dirs +1)%{gem_extdir_mri} spec popd %files -%exclude %{gem_instdir}/.gemtest -%{gem_extdir_mri} %dir %{gem_instdir} -%doc %{gem_instdir}/BSDL -%doc %{gem_instdir}/POSTGRES -%doc %{gem_instdir}/LICENSE +%{gem_extdir_mri} +%exclude %{gem_instdir}/.gemtest +%license %{gem_instdir}/BSDL +%license %{gem_instdir}/POSTGRES +%license %{gem_instdir}/LICENSE %{gem_libdir} %exclude %{gem_cache} %{gem_spec} @@ -114,19 +112,19 @@ popd %doc %{gem_instdir}/Contributors.rdoc %doc %{gem_instdir}/History.rdoc %doc %{gem_instdir}/Manifest.txt -%{gem_instdir}/Rakefile -%{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 +%doc %{gem_instdir}/README.ja.rdoc +%doc %{gem_instdir}/README.rdoc +%{gem_instdir}/Rakefile +%{gem_instdir}/Rakefile.cross %{gem_instdir}/sample %{gem_instdir}/spec - %changelog -* Wed Jan 06 2016 Vít Ondruch - 0.18.2-2 +* Wed Jan 06 2016 Vít Ondruch - 0.18.4-1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 +- Update to pg 1.18.4. * Wed Aug 26 2015 Vít Ondruch - 0.18.2-1 - Update to pg 1.18.2. diff --git a/sources b/sources index 565072a..0bc1ea7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a963b46ddc65141c3a863b891e91449 pg-0.18.2.gem +ac35f7c82ca7ca7b8dfd8533a238a83d pg-0.18.4.gem From 3ff1ec3e32f4833b820d64b54a5eaaee13f8165c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 23:05:29 +0000 Subject: [PATCH 26/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index aeb0758..0734ac5 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.18.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -122,6 +122,9 @@ popd %{gem_instdir}/spec %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.18.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jan 06 2016 Vít Ondruch - 0.18.4-1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 - Update to pg 1.18.4. From 92668985b0f4c66c6fe457ea2b920ec4a21d6fec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jan 2017 13:17:23 +0900 Subject: [PATCH 27/38] F-26: rebuild for ruby24 Patch from the upstream for test failure with integer unification --- ...pg-0.18.4-ruby24-integer-unification.patch | 21 +++++++++++++++++++ rubygem-pg.spec | 10 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 rubygem-pg-0.18.4-ruby24-integer-unification.patch diff --git a/rubygem-pg-0.18.4-ruby24-integer-unification.patch b/rubygem-pg-0.18.4-ruby24-integer-unification.patch new file mode 100644 index 0000000..c7122ad --- /dev/null +++ b/rubygem-pg-0.18.4-ruby24-integer-unification.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Lars Kanis +# Date 1484422186 -3600 +# Node ID a446dfaf9d8f7f0223fb42184c1ad36e42b97b17 +# Parent 6ebcebaad39ca2a2496bfd5912659f35d02b409f +Bignum,Fixnum and Integer are the same in Ruby-2.4. + +Fixes #255 : https://bitbucket.org/ged/ruby-pg/issues/255 + +diff --git a/spec/pg/type_map_by_class_spec.rb b/spec/pg/type_map_by_class_spec.rb +--- a/spec/pg/type_map_by_class_spec.rb ++++ b/spec/pg/type_map_by_class_spec.rb +@@ -59,7 +59,7 @@ + it "should retrieve particular conversions" do + expect( tm[Integer] ).to eq(binaryenc_int) + expect( tm[Float] ).to eq(textenc_float) +- expect( tm[Bignum] ).to be_nil ++ expect( tm[Range] ).to be_nil + expect( derived_tm[raise_class] ).to be_kind_of(Proc) + expect( derived_tm[Array] ).to eq(:array_type_map_for) + end diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 0734ac5..25e7161 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.18.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -17,6 +17,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Disable RPATH. # https://bitbucket.org/ged/ruby-pg/issue/183 Patch0: rubygem-pg-0.17.1-remove-rpath.patch +# https://bitbucket.org/ged/ruby-pg/issues/255/ruby-24-test-failure +# https://bitbucket.org/ged/ruby-pg/commits/a446dfaf9d8f7f0223fb42184c1ad36e42b97b17/raw +Patch1: rubygem-pg-0.18.4-ruby24-integer-unification.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby-devel @@ -46,6 +49,7 @@ gem unpack %{SOURCE0} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %patch0 -p1 +%patch1 -p1 %build # Create the gem as gem install only works on a gem file @@ -122,6 +126,10 @@ popd %{gem_instdir}/spec %changelog +* Sun Jan 15 2017 Mamoru TASAKA - 0.18.4-3 +- F-26: rebuild for ruby24 +- Patch from the upstream for test failure with integer unification + * Thu Feb 04 2016 Fedora Release Engineering - 0.18.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b4957d477493ddf27371932a2ecc9ce455ddd4f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 12:35:48 +0000 Subject: [PATCH 28/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 25e7161..b107b4e 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -4,7 +4,7 @@ Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} Version: 0.18.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -126,6 +126,9 @@ popd %{gem_instdir}/spec %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.18.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jan 15 2017 Mamoru TASAKA - 0.18.4-3 - F-26: rebuild for ruby24 - Patch from the upstream for test failure with integer unification From 92e0fe87318e99c93462d52a741824a2edba1235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 29 May 2017 13:09:55 +0200 Subject: [PATCH 29/38] Update to pg 1.20.0. --- .gitignore | 1 + ...pg-0.18.4-ruby24-integer-unification.patch | 21 ------------------ rubygem-pg.spec | 22 +++++++++---------- sources | 2 +- 4 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 rubygem-pg-0.18.4-ruby24-integer-unification.patch diff --git a/.gitignore b/.gitignore index cfa06f1..6490ef4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pg-0.18.1.gem /pg-0.18.2.gem /pg-0.18.4.gem +/pg-0.20.0.gem diff --git a/rubygem-pg-0.18.4-ruby24-integer-unification.patch b/rubygem-pg-0.18.4-ruby24-integer-unification.patch deleted file mode 100644 index c7122ad..0000000 --- a/rubygem-pg-0.18.4-ruby24-integer-unification.patch +++ /dev/null @@ -1,21 +0,0 @@ -# HG changeset patch -# User Lars Kanis -# Date 1484422186 -3600 -# Node ID a446dfaf9d8f7f0223fb42184c1ad36e42b97b17 -# Parent 6ebcebaad39ca2a2496bfd5912659f35d02b409f -Bignum,Fixnum and Integer are the same in Ruby-2.4. - -Fixes #255 : https://bitbucket.org/ged/ruby-pg/issues/255 - -diff --git a/spec/pg/type_map_by_class_spec.rb b/spec/pg/type_map_by_class_spec.rb ---- a/spec/pg/type_map_by_class_spec.rb -+++ b/spec/pg/type_map_by_class_spec.rb -@@ -59,7 +59,7 @@ - it "should retrieve particular conversions" do - expect( tm[Integer] ).to eq(binaryenc_int) - expect( tm[Float] ).to eq(textenc_float) -- expect( tm[Bignum] ).to be_nil -+ expect( tm[Range] ).to be_nil - expect( derived_tm[raise_class] ).to be_kind_of(Proc) - expect( derived_tm[Array] ).to eq(:array_type_map_for) - end diff --git a/rubygem-pg.spec b/rubygem-pg.spec index b107b4e..6812800 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -1,11 +1,10 @@ # Generated from pg-0.11.0.gem by gem2rpm -*- rpm-spec -*- %global gem_name pg -Summary: A Ruby interface to the PostgreSQL RDBMS Name: rubygem-%{gem_name} -Version: 0.18.4 -Release: 4%{?dist} -Group: Development/Languages +Version: 0.20.0 +Release: 1%{?dist} +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 @@ -17,39 +16,37 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Disable RPATH. # https://bitbucket.org/ged/ruby-pg/issue/183 Patch0: rubygem-pg-0.17.1-remove-rpath.patch -# https://bitbucket.org/ged/ruby-pg/issues/255/ruby-24-test-failure -# https://bitbucket.org/ged/ruby-pg/commits/a446dfaf9d8f7f0223fb42184c1ad36e42b97b17/raw -Patch1: rubygem-pg-0.18.4-ruby24-integer-unification.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby-devel +# Compiler is required for build of gem binary extension. +# https://fedoraproject.org/wiki/Packaging:C_and_C++#BuildRequires_and_Requires +BuildRequires: gcc BuildRequires: postgresql-server postgresql-devel BuildRequires: rubygem(rspec) %description This is the extension library to access a PostgreSQL database from Ruby. -This library works with PostgreSQL 7.4 and later. +This library works with PostgreSQL 9.1 and later. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} BuildArch: noarch %description doc Documentation for %{name}. - %prep gem unpack %{SOURCE0} + %setup -q -D -T -n %{gem_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec %patch0 -p1 -%patch1 -p1 %build # Create the gem as gem install only works on a gem file @@ -126,6 +123,9 @@ popd %{gem_instdir}/spec %changelog +* Mon May 29 2017 Vít Ondruch - 0.20.0-1 +- Update to pg 1.20.0. + * Sat Feb 11 2017 Fedora Release Engineering - 0.18.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 0bc1ea7..4837935 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac35f7c82ca7ca7b8dfd8533a238a83d pg-0.18.4.gem +SHA512 (pg-0.20.0.gem) = 8c7ef2e3b0cb43f42b4f96c5995cd9ff8b01a0d0fc1cfd24d1053e27fa6d16f4eb7008fcb5f86445ad000429898df0215f7ee89b4da9500ddc4df04f5f2a10e2 From 2dabc6140e4826fbab73371f6ae20ddae0bd95a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 17:34:06 +0000 Subject: [PATCH 30/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 6812800..111cb65 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -123,6 +123,9 @@ popd %{gem_instdir}/spec %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.20.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 29 2017 Vít Ondruch - 0.20.0-1 - Update to pg 1.20.0. From f977cd710c971526a4835841143a3d69ad37d470 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:58:17 +0000 Subject: [PATCH 31/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 111cb65..f56be84 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -123,6 +123,9 @@ popd %{gem_instdir}/spec %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.20.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 04b1c7055cecca3312fc2af71345484bac57eb40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 17 Aug 2017 14:04:55 +0200 Subject: [PATCH 32/38] Update to pg 1.21.0. --- .gitignore | 1 + rubygem-pg.spec | 17 ++++++----------- sources | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6490ef4..8f5a03d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /pg-0.18.2.gem /pg-0.18.4.gem /pg-0.20.0.gem +/pg-0.21.0.gem diff --git a/rubygem-pg.spec b/rubygem-pg.spec index f56be84..ffdb46e 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -2,8 +2,8 @@ %global gem_name pg Name: rubygem-%{gem_name} -Version: 0.20.0 -Release: 3%{?dist} +Version: 0.21.0 +Release: 1%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -77,12 +77,6 @@ for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do && chmod -v 644 $file done -# Fix shebangs and executable bits of samples. -for file in `find %{buildroot}%{gem_instdir}/sample -type f -name "*.rb"`; do - sed -i -e '/^#!\/usr\/bin\/env/ s/.*/#!\/usr\/bin\/ruby/' $file \ - && chmod -v 755 $file -done - # Fix spec shebangs. # https://bitbucket.org/ged/ruby-pg/issue/74/ for file in `find %{buildroot}%{gem_instdir}/spec -type f ! -perm /a+x -name "*.rb"`; do @@ -117,12 +111,13 @@ popd %doc %{gem_instdir}/README-Windows.rdoc %doc %{gem_instdir}/README.ja.rdoc %doc %{gem_instdir}/README.rdoc -%{gem_instdir}/Rakefile -%{gem_instdir}/Rakefile.cross -%{gem_instdir}/sample +%{gem_instdir}/Rakefile* %{gem_instdir}/spec %changelog +* Thu Aug 17 2017 Vít Ondruch - 0.21.0-1 +- Update to pg 1.21.0. + * Thu Aug 03 2017 Fedora Release Engineering - 0.20.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 4837935..5ef6319 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pg-0.20.0.gem) = 8c7ef2e3b0cb43f42b4f96c5995cd9ff8b01a0d0fc1cfd24d1053e27fa6d16f4eb7008fcb5f86445ad000429898df0215f7ee89b4da9500ddc4df04f5f2a10e2 +SHA512 (pg-0.21.0.gem) = 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b From 01ad574b3018e85e41fdfd917e31363219ee9828 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 8 Dec 2017 12:06:50 +0100 Subject: [PATCH 33/38] Fix failed tests for PostgreSQL-10. --- ....21.0-adjust-tests-for-postgresql-10.patch | 57 +++++++++++++++++++ rubygem-pg.spec | 27 ++++++--- 2 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch diff --git a/rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch b/rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch new file mode 100644 index 0000000..d9f488d --- /dev/null +++ b/rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch @@ -0,0 +1,57 @@ +From 55ca6dd8c1e0925f617b8f9e9042cbea01cf0eb8 Mon Sep 17 00:00:00 2001 +From: Lars Kanis +Date: Mon, 23 Oct 2017 13:02:45 +0200 +Subject: [PATCH] Adjust tests for PostgreSQL-10 + +--- + spec/helpers.rb | 2 +- + spec/pg/connection_spec.rb | 13 +++++++++---- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/spec/helpers.rb b/spec/helpers.rb +index d13df5e..e9856de 100755 +--- a/spec/helpers.rb ++++ b/spec/helpers.rb +@@ -251,7 +251,7 @@ module PG::TestingHelpers + + def check_for_lingering_connections( conn ) + conn.exec( "SELECT * FROM pg_stat_activity" ) do |res| +- conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid } ++ conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) } + unless conns.empty? + puts "Lingering connections remain:" + conns.each do |row| +diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb +index d055673..0924ca4 100755 +--- a/spec/pg/connection_spec.rb ++++ b/spec/pg/connection_spec.rb +@@ -219,7 +219,7 @@ describe PG::Connection do + described_class.connect(@conninfo).finish + sleep 0.5 + res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity +- WHERE usename IS NOT NULL]) ++ WHERE usename IS NOT NULL AND application_name != '']) + # there's still the global @conn, but should be no more + expect( res[0]['n'] ).to eq( '1' ) + end +@@ -1524,9 +1524,14 @@ describe PG::Connection do + end + + it "shouldn't type map params unless requested" do +- expect{ +- @conn.exec_params( "SELECT $1", [5] ) +- }.to raise_error(PG::IndeterminateDatatype) ++ if @conn.server_version < 100000 ++ expect{ ++ @conn.exec_params( "SELECT $1", [5] ) ++ }.to raise_error(PG::IndeterminateDatatype) ++ else ++ # PostgreSQL-10 maps to TEXT type (OID 25) ++ expect( @conn.exec_params( "SELECT $1", [5] ).ftype(0)).to eq(25) ++ end + end + + it "should raise an error on invalid encoder to put_copy_data" do +-- +2.14.3 + diff --git a/rubygem-pg.spec b/rubygem-pg.spec index ffdb46e..071c27f 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -16,6 +16,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Disable RPATH. # https://bitbucket.org/ged/ruby-pg/issue/183 Patch0: rubygem-pg-0.17.1-remove-rpath.patch +# Fix tests for PostgreSQL-10. +# https://github.com/ged/ruby-pg/commit/fe24a71 +Patch1: rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby-devel @@ -78,16 +81,23 @@ for file in `find %{buildroot}%{gem_libdir} -type f -name "*.rb"`; do done # Fix spec shebangs. -# https://bitbucket.org/ged/ruby-pg/issue/74/ -for file in `find %{buildroot}%{gem_instdir}/spec -type f ! -perm /a+x -name "*.rb"`; do - [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] \ - && sed -i -e 's/^#!\/usr\/bin\/env spec/#!\/usr\/bin\/env rspec/' $file \ - && chmod -v 755 $file +# https://bitbucket.org/ged/ruby-pg/issues/269/ +for file in `find %{buildroot}%{gem_instdir}/spec -type f -name "*.rb"`; do + if [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ]; then + sed -i '/^#!\/usr\/bin\/env/ d' $file + chmod -v 644 $file + fi done %check pushd .%{gem_instdir} -rspec -I$(dirs +1)%{gem_extdir_mri} spec +cat "%{PATCH1}" | patch -p1 +# Set LANG to prevent encoding warnings. See spec/pg/connection_spec.rb +# test case: "receives properly encoded messages in the notice callbacks". +# Set --verbose to show detail log by $VERBOSE. +# See https://github.com/ged/ruby-pg/blob/master/spec/helpers.rb $VERBOSE +LANG=en_US.UTF-8 ruby -S --verbose \ + rspec -I$(dirs +1)%{gem_extdir_mri} -f d spec popd %files @@ -115,6 +125,9 @@ popd %{gem_instdir}/spec %changelog +* Fri Dec 08 2017 Jun Aruga - 0.21.0-2 +- Fix failed tests for PostgreSQL-10. + * Thu Aug 17 2017 Vít Ondruch - 0.21.0-1 - Update to pg 1.21.0. From 8da10b80e8efbfb95a0e3234c50a3092ab40a85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 4 Jan 2018 09:30:59 +0100 Subject: [PATCH 34/38] Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.5 --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 071c27f..da2f512 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.21.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %{gem_instdir}/spec %changelog +* Thu Jan 04 2018 Vít Ondruch - 0.21.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.5 + * Fri Dec 08 2017 Jun Aruga - 0.21.0-2 - Fix failed tests for PostgreSQL-10. From 5c93d2f24c323701909f7465bec93ea45ddab0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:08:09 +0100 Subject: [PATCH 35/38] Rebuilt for switch to libxcrypt --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index da2f512..fa0e081 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.21.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %{gem_instdir}/spec %changelog +* Sat Jan 20 2018 Björn Esser - 0.21.0-4 +- Rebuilt for switch to libxcrypt + * Thu Jan 04 2018 Vít Ondruch - 0.21.0-3 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.5 From 273cbffbf7a5b29b94c45185500bce6027dd6c2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 14:32:38 +0000 Subject: [PATCH 36/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-pg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-pg.spec b/rubygem-pg.spec index fa0e081..53cda2a 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -3,7 +3,7 @@ Name: rubygem-%{gem_name} Version: 0.21.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -125,6 +125,9 @@ popd %{gem_instdir}/spec %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.21.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 0.21.0-4 - Rebuilt for switch to libxcrypt From be5aaac754eabf8413ac813784e03fefc89bc36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 13 Feb 2018 12:31:35 +0100 Subject: [PATCH 37/38] Update to pg 1.0.0. --- .gitignore | 1 + rubygem-pg-0.17.1-remove-rpath.patch | 2 +- ....21.0-adjust-tests-for-postgresql-10.patch | 57 ------------------- rubygem-pg.spec | 31 ++++------ sources | 2 +- 5 files changed, 15 insertions(+), 78 deletions(-) delete mode 100644 rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch diff --git a/.gitignore b/.gitignore index 8f5a03d..4dd97a6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /pg-0.18.4.gem /pg-0.20.0.gem /pg-0.21.0.gem +/pg-1.0.0.gem diff --git a/rubygem-pg-0.17.1-remove-rpath.patch b/rubygem-pg-0.17.1-remove-rpath.patch index b52e604..d947016 100644 --- a/rubygem-pg-0.17.1-remove-rpath.patch +++ b/rubygem-pg-0.17.1-remove-rpath.patch @@ -1,7 +1,7 @@ diff --git a/ext/extconf.rb b/ext/extconf.rb --- a/ext/extconf.rb +++ b/ext/extconf.rb -@@ -29,13 +29,6 @@ +@@ -33,13 +33,6 @@ incdir = `"#{pgconfig}" --includedir`.chomp libdir = `"#{pgconfig}" --libdir`.chomp dir_config 'pg', incdir, libdir diff --git a/rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch b/rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch deleted file mode 100644 index d9f488d..0000000 --- a/rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 55ca6dd8c1e0925f617b8f9e9042cbea01cf0eb8 Mon Sep 17 00:00:00 2001 -From: Lars Kanis -Date: Mon, 23 Oct 2017 13:02:45 +0200 -Subject: [PATCH] Adjust tests for PostgreSQL-10 - ---- - spec/helpers.rb | 2 +- - spec/pg/connection_spec.rb | 13 +++++++++---- - 2 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/spec/helpers.rb b/spec/helpers.rb -index d13df5e..e9856de 100755 ---- a/spec/helpers.rb -+++ b/spec/helpers.rb -@@ -251,7 +251,7 @@ module PG::TestingHelpers - - def check_for_lingering_connections( conn ) - conn.exec( "SELECT * FROM pg_stat_activity" ) do |res| -- conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid } -+ conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) } - unless conns.empty? - puts "Lingering connections remain:" - conns.each do |row| -diff --git a/spec/pg/connection_spec.rb b/spec/pg/connection_spec.rb -index d055673..0924ca4 100755 ---- a/spec/pg/connection_spec.rb -+++ b/spec/pg/connection_spec.rb -@@ -219,7 +219,7 @@ describe PG::Connection do - described_class.connect(@conninfo).finish - sleep 0.5 - res = @conn.exec(%[SELECT COUNT(*) AS n FROM pg_stat_activity -- WHERE usename IS NOT NULL]) -+ WHERE usename IS NOT NULL AND application_name != '']) - # there's still the global @conn, but should be no more - expect( res[0]['n'] ).to eq( '1' ) - end -@@ -1524,9 +1524,14 @@ describe PG::Connection do - end - - it "shouldn't type map params unless requested" do -- expect{ -- @conn.exec_params( "SELECT $1", [5] ) -- }.to raise_error(PG::IndeterminateDatatype) -+ if @conn.server_version < 100000 -+ expect{ -+ @conn.exec_params( "SELECT $1", [5] ) -+ }.to raise_error(PG::IndeterminateDatatype) -+ else -+ # PostgreSQL-10 maps to TEXT type (OID 25) -+ expect( @conn.exec_params( "SELECT $1", [5] ).ftype(0)).to eq(25) -+ end - end - - it "should raise an error on invalid encoder to put_copy_data" do --- -2.14.3 - diff --git a/rubygem-pg.spec b/rubygem-pg.spec index 53cda2a..bdd3fd3 100644 --- a/rubygem-pg.spec +++ b/rubygem-pg.spec @@ -2,8 +2,8 @@ %global gem_name pg Name: rubygem-%{gem_name} -Version: 0.21.0 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: A Ruby interface to the PostgreSQL RDBMS # Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/) # @@ -16,9 +16,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Disable RPATH. # https://bitbucket.org/ged/ruby-pg/issue/183 Patch0: rubygem-pg-0.17.1-remove-rpath.patch -# Fix tests for PostgreSQL-10. -# https://github.com/ged/ruby-pg/commit/fe24a71 -Patch1: rubygem-pg-0.21.0-adjust-tests-for-postgresql-10.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby-devel @@ -43,17 +40,13 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} - -%setup -q -D -T -n %{gem_name}-%{version} - -gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec +%setup -q -n %{gem_name}-%{version} %patch0 -p1 %build # Create the gem as gem install only works on a gem file -gem build %{gem_name}.gemspec +gem build ../%{gem_name}-%{version}.gemspec # %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir # by default, so that we can move it into the buildroot in %%install @@ -91,12 +84,9 @@ done %check pushd .%{gem_instdir} -cat "%{PATCH1}" | patch -p1 -# Set LANG to prevent encoding warnings. See spec/pg/connection_spec.rb -# test case: "receives properly encoded messages in the notice callbacks". # Set --verbose to show detail log by $VERBOSE. # See https://github.com/ged/ruby-pg/blob/master/spec/helpers.rb $VERBOSE -LANG=en_US.UTF-8 ruby -S --verbose \ +ruby -S --verbose \ rspec -I$(dirs +1)%{gem_extdir_mri} -f d spec popd @@ -125,6 +115,9 @@ popd %{gem_instdir}/spec %changelog +* Tue Feb 13 2018 Vít Ondruch - 1.0.0-1 +- Update to pg 1.0.0. + * Fri Feb 09 2018 Fedora Release Engineering - 0.21.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -138,7 +131,7 @@ popd - Fix failed tests for PostgreSQL-10. * Thu Aug 17 2017 Vít Ondruch - 0.21.0-1 -- Update to pg 1.21.0. +- Update to pg 0.21.0. * Thu Aug 03 2017 Fedora Release Engineering - 0.20.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -147,7 +140,7 @@ popd - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild * Mon May 29 2017 Vít Ondruch - 0.20.0-1 -- Update to pg 1.20.0. +- Update to pg 0.20.0. * Sat Feb 11 2017 Fedora Release Engineering - 0.18.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -161,10 +154,10 @@ popd * Wed Jan 06 2016 Vít Ondruch - 0.18.4-1 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.3 -- Update to pg 1.18.4. +- Update to pg 0.18.4. * Wed Aug 26 2015 Vít Ondruch - 0.18.2-1 -- Update to pg 1.18.2. +- Update to pg 0.18.2. * Thu Jun 18 2015 Fedora Release Engineering - 0.18.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 5ef6319..ac7b776 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pg-0.21.0.gem) = 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b +SHA512 (pg-1.0.0.gem) = 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398 From 97da650f1f67fa1ffed375f614cec6d3806b9959 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 9 Mar 2018 15:41:30 +0100 Subject: [PATCH 38/38] Merge Fedora master. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ac7b776..00dbbc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pg-1.0.0.gem) = 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398 +27eca76d6f9b8b290210adf9e90406e7 pg-1.0.0.gem