Project

General

Profile

« Previous | Next » 

Revision 889f832a

Added by Dominic Cleal over 8 years ago

Undo obsoleting of replacement packages

Allows them to be installed alongside, but usually version requirements or
specific requires on the tfm version will pull in our newer version.

This ensures we don't break the ruby193 collection by replacing components
with packages outside of ruby193.

(Later perhaps obsolete the specific versions we used to ship.)

View differences:

foreman/foreman.spec
# Gemfile
Requires: %{?scl_prefix_ruby}rubygem(rails) >= 3.2.8
Requires: %{?scl_prefix_ruby}rubygem(rails) < 3.3.0
# replace ruby SCL's sprockets build with our own
Requires: %{?scl_prefix}rubygem(sprockets)
# minitest - workaround as rubygem-activesupport is missing dep
Requires: %{?scl_prefix_ruby}rubygem(minitest)
Requires: %{?scl_prefix_ruby}rubygem(json) >= 1.5
......
# Gemfile
BuildRequires: %{?scl_prefix_ruby}rubygem(rails) >= 3.2.8
BuildRequires: %{?scl_prefix_ruby}rubygem(rails) < 3.3.0
# replace ruby SCL's sprockets build with our own
BuildRequires: %{?scl_prefix}rubygem(sprockets)
# minitest - workaround as rubygem-activesupport is missing dep
BuildRequires: %{?scl_prefix_ruby}rubygem(minitest)
BuildRequires: %{?scl_prefix_ruby}rubygem(json) >= 1.5
rubygem-angular-rails-templates/rubygem-angular-rails-templates.spec
Requires: %{?scl_prefix_ruby}ruby(rubygems)
Requires: %{?scl_prefix_ruby}rubygem(railties) >= 3.1
Requires: %{?scl_prefix_ruby}rubygem(sprockets)
Requires: %{?scl_prefix}rubygem(sprockets)
Requires: %{?scl_prefix_ruby}rubygem(tilt)
%if "%{?scl_ruby}" == "ruby193" || (0%{?el6} && 0%{!?scl:1})
Requires: %{?scl_prefix_ruby}ruby(abi)
rubygem-multi_json/rubygem-multi_json.spec
# BuildRequires: %{?scl_prefix_ruby}rubygem(rspec)
BuildArch: noarch
Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
# OkJson is allowed to be bundled:
# https://fedorahosted.org/fpc/ticket/113
Provides: bundled(%{?scl_prefix}okjson) = 20110719
%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}}
%description
A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem,
......
Summary: Documentation for %{pkg_name}
Group: Documentation
Requires: %{?scl:%scl_prefix}%{pkg_name} = %{version}-%{release}
%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}-doc}
BuildArch: noarch
%description doc
rubygem-sass/rubygem-sass.spec
BuildRequires: %{?scl_prefix_ruby}rubygem(minitest)
BuildArch: noarch
Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}}
%description
Sass makes CSS fun again. Sass is an extension of CSS3, adding
......
Summary: Documentation for %{pkg_name}
Group: Documentation
Requires: %{?scl_prefix}%{pkg_name} = %{version}-%{release}
%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}-doc}
BuildArch: noarch
%description doc
rubygem-sprockets/rubygem-sprockets.spec
BuildArch: noarch
Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}}
%description
Sprockets is a Rack-based asset packaging system that concatenates and serves
......
Summary: Documentation for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
%{?scl:Obsoletes: ruby193-rubygem-%{gem_name}-doc}
BuildArch: noarch
%description doc

Also available in: Unified diff