[rubygem-pg/el6] Upgrade to pg 0.12.2.
Vít Ondruch
vondruch at fedoraproject.org
Tue Apr 3 06:05:37 UTC 2012
commit d705ecc6e5401fd8fddc242ba991c05859f34f48
Author: Vít Ondruch <vondruch at redhat.com>
Date: Tue Apr 3 08:05:29 2012 +0200
Upgrade to pg 0.12.2.
rubygem-pg.spec | 104 ++++++++++++++++++++++++++++---------------------------
1 files changed, 53 insertions(+), 51 deletions(-)
---
diff --git a/rubygem-pg.spec b/rubygem-pg.spec
index 4a76ced..f312eef 100644
--- a/rubygem-pg.spec
+++ b/rubygem-pg.spec
@@ -1,11 +1,14 @@
# Generated from pg-0.11.0.gem by gem2rpm -*- rpm-spec -*-
-%global gem_name pg
-%global rubyabi 1.9.1
+%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-%{gem_name}
+Name: rubygem-%{gemname}
Version: 0.12.2
-Release: 2%{?dist}
+Release: 1%{?dist}
Group: Development/Languages
# Upstream license clarification (https://bitbucket.org/ged/ruby-pg/issue/72/)
#
@@ -14,19 +17,19 @@ 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
+Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
Requires: ruby(abi) = %{rubyabi}
-Requires: ruby(rubygems)
+Requires: rubygems
Requires: ruby
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby-devel
-BuildRequires: rubygems-devel
-BuildRequires: ruby
+BuildRequires: rubygems
+BuildRequires: ruby ruby-devel
BuildRequires: postgresql-server postgresql-devel
+# EPEL does not have RSpec 2.x :/
+%if 0%{?fedora}
# 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
+%endif
Provides: rubygem(%{gem_name}) = %{version}
%description
@@ -46,75 +49,74 @@ Documentation for %{name}
%prep
%setup -q -c -T
-mkdir -p .%{gem_dir}
+mkdir -p .%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install --local --install-dir .%{gem_dir} \
+gem install --local --install-dir .%{gemdir} \
-V --force %{SOURCE0}
%build
%install
-mkdir -p %{buildroot}%{gem_dir}
-mkdir -p %{buildroot}%{gem_extdir}/lib
-cp -a .%{gem_dir}/* \
- %{buildroot}%{gem_dir}/
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* \
+ %{buildroot}%{gemdir}/
-mv %{buildroot}%{gem_libdir}/pg_ext.so %{buildroot}%{gem_extdir}/lib
+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}%{gem_instdir}/ext
+rm -rf %{buildroot}%{geminstdir}/ext
# Remove useless shebangs.
-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}%{geminstdir}/lib/pg.rb
+sed -i -e '/^#!rake/d' %{buildroot}%{geminstdir}/Rakefile
+sed -i -e '/^#!rake/d' %{buildroot}%{geminstdir}/Rakefile.cross
# 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
+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
+%if 0%{?fedora}
%check
-pushd .%{gem_instdir}
+pushd .%{geminstdir}
rspec spec
popd
+%endif
%files
-%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}
+%exclude %{geminstdir}/.gemtest
+%{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
%files doc
-%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
+%doc %{gemdir}/doc/%{gemname}-%{version}
+%doc %{geminstdir}/ChangeLog
+%doc %{geminstdir}/Contributors.rdoc
+%doc %{geminstdir}/History.rdoc
+%doc %{geminstdir}/Manifest.txt
+%{geminstdir}/Rakefile
+%{geminstdir}/Rakefile.cross
+%doc %{geminstdir}/README.rdoc
+%doc %{geminstdir}/README.ja.rdoc
+%doc %{geminstdir}/README.OS_X.rdoc
+%doc %{geminstdir}/README.windows.rdoc
+%{geminstdir}/misc
+%{geminstdir}/sample
+%{geminstdir}/spec
%changelog
-* Tue Feb 07 2012 Vít Ondruch <vondruch at redhat.com> - 0.12.2-2
-- Obsolete ruby-postgress, which was retired.
-
-* Tue Jan 24 2012 Vít Ondruch <vondruch at redhat.com> - 0.12.2-1
-- Rebuilt for Ruby 1.9.3.
+* Tue Apr 03 2012 Vít Ondruch <vondruch at redhat.com> - 0.12.2-1
- Upgrade to pg 0.12.2.
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-6
More information about the scm-commits
mailing list