From 8a3ab45c42a7b7144e13fd022a309c2f565dfb55 Mon Sep 17 00:00:00 2001 From: Xavier LAMIEN Date: Sun, 9 May 2010 17:07:14 +0000 Subject: [PATCH 1/3] update release & manage Editor UI --- rubygem-json.spec | 41 ++++++++++++++++++++++++++++++++++------- sources | 2 +- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 349415d..029e238 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -8,7 +8,7 @@ Name: rubygem-%{gemname} -Version: 1.1.9 +Version: 1.4.3 Release: 1%{?dist} Summary: A JSON implementation in Ruby @@ -22,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby, ruby-devel BuildRequires: rubygem(rake) Requires: ruby(abi) = 1.8 -Requires: ruby(gtk2), rubygems +Requires: rubygems Provides: rubygem(json) = %{version} %description @@ -52,6 +52,15 @@ 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 + +Requires: %{name} = %{version}-%{release} +Requires: ruby(gtk2) + +%description -n rubygem-%{gemname}-gui +This package provides UI editor for ruby-%{gemname}. %prep @@ -73,8 +82,8 @@ mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext cp -a .%{gemdir}/* %{buildroot}/%{gemdir} # Let's move arch dependent files to %%ruby_sitearch -mv .%{geminstdir}/ext/json/ext/*.so \ - $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext +find . -name "*.so" -exec mv {} \ + $RPM_BUILD_ROOT%{ruby_sitearch}/%{gemname}/ext \; mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT%{_bindir} @@ -155,10 +164,19 @@ popd %defattr(-,root,root,-) %doc %{geminstdir}/[A-Z]* %dir %{geminstdir} -%{_bindir}/*.rb +%dir %{geminstdir}/lib +%dir %{geminstdir}/lib/%{gemname} +%{_bindir}/prettify_json.rb %{geminstdir}/bin -%{geminstdir}/lib %{geminstdir}/tools +%{geminstdir}/lib/%{gemname}.rb +%{geminstdir}/lib/%{gemname}/add +%{geminstdir}/lib/%{gemname}/pure +%{geminstdir}/lib/%{gemname}/*.xpm +%{geminstdir}/lib/%{gemname}/common.rb +%{geminstdir}/lib/%{gemname}/ext.rb +%{geminstdir}/lib/%{gemname}/pure.rb +%{geminstdir}/lib/%{gemname}/version.rb %{ruby_sitearch}/%{gemname} %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec @@ -169,7 +187,7 @@ popd %{geminstdir}/data %{geminstdir}/tests %{geminstdir}/benchmarks -%{geminstdir}/doc-main.txt +#%{geminstdir}/doc-main.txt %{gemdir}/doc/%{gemname}-%{version} %files -n ruby-%{gemname} @@ -177,8 +195,17 @@ popd %{ruby_sitelib}/%{gemname} %{ruby_sitelib}/%{gemname}.rb +%files -n rubygem-%{gemname}-gui +%defattr(-,root,root,-) +%{_bindir}/edit_json.rb +%{geminstdir}/lib/%{gemname}/editor.rb + %changelog +* Sun May 09 2010 Xavier Lamien - 1.4.3-1 +- Update release. +- Split-out json editor. + * Thu Oct 29 2009 Xavier Lamien - 1.1.9-1 - Update release. diff --git a/sources b/sources index 2ed0130..7c4fe42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b29ddb63ba1c0d3a9ecdaf944df61157 json-1.1.9.gem +0bcd3fbcb41c84077b8bfac952c7e6ca json-1.4.3.gem From 32dc3a13402ec043fcd82edb27e19e1eae21ed7c Mon Sep 17 00:00:00 2001 From: Xavier LAMIEN Date: Mon, 10 May 2010 09:42:31 +0000 Subject: [PATCH 2/3] Remove missing link and requires --- rubygem-json.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 029e238..00ceead 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -9,7 +9,7 @@ Name: rubygem-%{gemname} Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A JSON implementation in Ruby Group: Development/Languages @@ -192,16 +192,27 @@ popd %files -n ruby-%{gemname} %defattr(-,root,root,-) -%{ruby_sitelib}/%{gemname} +%dir %{ruby_sitelib}/%{gemname} +%{ruby_sitelib}/%{gemname}/add +%{ruby_sitelib}/%{gemname}/pure +%{ruby_sitelib}/%{gemname}/*.xpm +%{ruby_sitelib}/%{gemname}/common.rb +%{ruby_sitelib}/%{gemname}/ext.rb +%{ruby_sitelib}/%{gemname}/pure.rb +%{ruby_sitelib}/%{gemname}/version.rb %{ruby_sitelib}/%{gemname}.rb %files -n rubygem-%{gemname}-gui %defattr(-,root,root,-) %{_bindir}/edit_json.rb +%{ruby_sitelib}/%{gemname}/editor.rb %{geminstdir}/lib/%{gemname}/editor.rb %changelog +* Mon May 10 2010 Xavier Lamien - 1.4.3-2 +- Move editor out of ruby-json sub-package. + * Sun May 09 2010 Xavier Lamien - 1.4.3-1 - Update release. - Split-out json editor. From e29fc160b67af55d398e2cfd92ef81b4ce66691f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:51:55 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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/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