From 29f6102725bd1055480cd9e16fd9978401144646 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:45:34 +0000 Subject: [PATCH 1/4] Initialize branch F-12 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..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 8714ec9bfe8bccba9439c96852e01232663cdd4a Mon Sep 17 00:00:00 2001 From: Xavier LAMIEN Date: Fri, 30 Oct 2009 20:16:40 +0000 Subject: [PATCH 2/4] Update release --- rubygem-json.spec | 10 ++++++---- sources | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rubygem-json.spec b/rubygem-json.spec index 62ca5ed..349415d 100644 --- a/rubygem-json.spec +++ b/rubygem-json.spec @@ -8,8 +8,8 @@ Name: rubygem-%{gemname} -Version: 1.1.7 -Release: 3%{?dist} +Version: 1.1.9 +Release: 1%{?dist} Summary: A JSON implementation in Ruby Group: Development/Languages @@ -61,7 +61,6 @@ mkdir -p ./%{gemdir} %build export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -#pushd ./%{gemdir} gem install --local --install-dir .%{gemdir} -V --force %{SOURCE0} %install @@ -170,7 +169,7 @@ popd %{geminstdir}/data %{geminstdir}/tests %{geminstdir}/benchmarks -%{geminstdir}/doc-templates +%{geminstdir}/doc-main.txt %{gemdir}/doc/%{gemname}-%{version} %files -n ruby-%{gemname} @@ -180,6 +179,9 @@ popd %changelog +* Thu Oct 29 2009 Xavier Lamien - 1.1.9-1 +- Update release. + * Wed Aug 12 2009 Xavier Lamien - 1.1.7-3 - Fix gem scripts and install_dir. - Enable %%check stage. diff --git a/sources b/sources index abc1c4c..2ed0130 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8e760e37e1b6230de7ef7bd828e79c4 json-1.1.7.gem +b29ddb63ba1c0d3a9ecdaf944df61157 json-1.1.9.gem From 2a37a8473d6cf03e6323bcbafe73d84025a456bb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:22 +0000 Subject: [PATCH 3/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 f09883d7600f39b60267c2bbfcad86c4de2524d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:51:52 +0000 Subject: [PATCH 4/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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 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