From 98f627e73def2d9316351fc001e7a094f17d06a7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:22 +0000 Subject: [PATCH 1/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92f744e..b0a6a6c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := rubygem-json SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 7ceadf345ef9aad0c788cb21a433cb5491773db7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:22:02 +0000 Subject: [PATCH 2/4] Initialize branch EL-6 for rubygem-json --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From b657759bb3d86da9cd9c5836e90ec8cf1d4d1aa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:51:55 +0000 Subject: [PATCH 3/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b0a6a6c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rubygem-json -# $Id$ -NAME := rubygem-json -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 5e730b6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -rubygem-json-1_1_7-3_fc10:HEAD:rubygem-json-1.1.7-3.fc10.src.rpm:1250276064 From ef7c396bd764133c396831b7fdb09c6e8664b357 Mon Sep 17 00:00:00 2001 From: Michael Stahnke Date: Sat, 12 Nov 2011 21:42:43 -0600 Subject: [PATCH 4/4] 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 --- rubygem-json.spec | 68 ++++++++++++++++++++++++++++++----------------- sources | 2 +- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 376169c..da4d5d2 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -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 - 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 - 1.4.3-3 - Move ruby's site_lib editor to ruby-json-gui. diff --git a/sources b/sources index 7c4fe42..069b739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0bcd3fbcb41c84077b8bfac952c7e6ca json-1.4.3.gem +10a923c1c031c55d2bac861664431301 json-1.4.6.gem