Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Michael Stahnke
ef7c396bd7 Fix failed EPEL repoclosure
NOTE: This package has been failing the EPEL dependency checks for
months on EL6.  There was a bug filed long ago (probably about a year)
asking GTK to not be a dependency.  This was split into a seperate
package, however since ruby-gtk2 was not available in EPEL6, failures
still happened.  After waiting and wanting JSON in EPEL for quite a
while, I decided to take action.  In this spec I have commented out the
gui package.  This removes the requirements for ruby-gtk2 and then we
get json.  As of today, there is still no ruby-gtk2 available in EL6
or EPEL.

This commit also bumps the version to 1.4.6 (same as rawhide)

Signed-off-by: Michael Stahnke <stahnma@puppetlabs.com>
2012-01-07 18:43:46 -06:00
stahnma
b3fd06cace Merge remote branch 'origin/f13/master' into el6 2010-09-14 18:42:38 -04:00
Fedora Release Engineering
b657759bb3 dist-git conversion 2010-07-29 11:51:55 +00:00
Dennis Gilmore
7ceadf345e Initialize branch EL-6 for rubygem-json 2010-05-08 02:22:02 +00:00
Bill Nottingham
98f627e73d Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:31:22 +00:00
2 changed files with 45 additions and 25 deletions

View file

@ -1,3 +1,14 @@
# NOTE: This package has been failing the EPEL dependency checks for months on
# EL6. There was a bug filed long ago (probably about a year) asking GTK to
# not be a dependency. This was split into a seperate package, however since
# ruby-gtk2 was not available in EPEL6, failures still happened. After waiting
# and wanting JSON in EPEL for quite a while, I decided to take action. In
# this spec I have commented out the -gui package. This removes the
# requirements for ruby-gtk2 and then we get json.
# As of today, there is still no ruby-gtk2 available in EL6 or EPEL.
# stahnma 2011-Dec-27
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
@ -8,8 +19,8 @@
Name: rubygem-%{gemname}
Version: 1.4.3
Release: 3%{?dist}
Version: 1.4.6
Release: 1%{?dist}
Summary: A JSON implementation in Ruby
Group: Development/Languages
@ -52,25 +63,25 @@ Provides: ruby(%{gemname}) = %{version}-%{release}
%description -n ruby-%{gemname}
This package provides non-Gem support for %{gemname}.
%package -n rubygem-%{gemname}-gui
Summary: Gtk2 based Editor for ruby JSON.
Group: User Interface/Desktops
#%package -n rubygem-%{gemname}-gui
#Summary: Gtk2 based Editor for ruby JSON.
#Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
Requires: ruby(gtk2)
#Requires: %{name} = %{version}-%{release}
#Requires: ruby(gtk2)
%description -n rubygem-%{gemname}-gui
This package provides UI editor for rubygem-%{gemname}.
#%description -n rubygem-%{gemname}-gui
#This package provides UI editor for rubygem-%{gemname}.
%package -n ruby-%{gemname}-gui
Summary: Gtk2 based editor for Ruby JSON
Group: User Interface/Desktop
#%package -n ruby-%{gemname}-gui
#Summary: Gtk2 based editor for Ruby JSON
#Group: User Interface/Desktop
Requires: ruby-%{gemname} = %{version}-%{release}
Requires: ruby(gtk2)
#Requires: ruby-%{gemname} = %{version}-%{release}
#Requires: ruby(gtk2)
%description -n ruby-%{gemname}-gui
This package provides UI editor for ruby-%{gemname}.
#%description -n ruby-%{gemname}-gui
#This package provides UI editor for ruby-%{gemname}.
%prep
%setup -q -c -T
@ -159,6 +170,11 @@ popd
create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
# Removing GTK as a requirement
rm -f %{buildroot}%{_bindir}/edit_json.rb
rm -f %{buildroot}%{geminstdir}/lib/%{gemname}/editor.rb
rm -f %{buildroot}%{ruby_sitelib}/%{gemname}/editor.rb
%clean
rm -rf $RPM_BUILD_ROOT
@ -211,17 +227,21 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_sitelib}/%{gemname}/version.rb
%{ruby_sitelib}/%{gemname}.rb
%files -n rubygem-%{gemname}-gui
%defattr(-,root,root,-)
%{_bindir}/edit_json.rb
%{geminstdir}/lib/%{gemname}/editor.rb
%files -n ruby-%{gemname}-gui
%defattr(-,root,root,-)
%{ruby_sitelib}/%{gemname}/editor.rb
#%files -n rubygem-%{gemname}-gui
#%defattr(-,root,root,-)
#%{_bindir}/edit_json.rb
#%{geminstdir}/lib/%{gemname}/editor.rb
#
#%files -n ruby-%{gemname}-gui
#%defattr(-,root,root,-)
#%{ruby_sitelib}/%{gemname}/editor.rb
%changelog
* Wed Dec 28 2011 <stahnma@fedoraproject.org> - 1.4.6-1
- Update to 1.4.6. (where rawhide is)
- rebuilt to remove dependency (and subpackage) for gui
* Fri Jun 11 2010 Xavier Lamien <laxathom@fedoraproject.org> - 1.4.3-3
- Move ruby's site_lib editor to ruby-json-gui.

View file

@ -1 +1 @@
0bcd3fbcb41c84077b8bfac952c7e6ca json-1.4.3.gem
10a923c1c031c55d2bac861664431301 json-1.4.6.gem