From be10f0798bf917a73e4ac75477063faada22c594 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:18 +0000 Subject: [PATCH 1/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 81700b2..ee91978 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: rubygem-highline -# $Id$ +# $Id: Makefile,v 1.1 2008/10/01 18:58:16 kevin Exp $ NAME := rubygem-highline 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 f27e3294d50a05793b838b99800ee36fe7f3dec2 Mon Sep 17 00:00:00 2001 From: Jeroen van Meeuwen Date: Tue, 22 Dec 2009 01:37:52 +0000 Subject: [PATCH 2/4] 1.5.1-1 --- .cvsignore | 2 +- import.log | 1 + rubygem-highline.spec | 16 +++++++++------- sources | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0449a75..4f1d628 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -highline-1.5.0.tgz +highline-1.5.1.tgz diff --git a/import.log b/import.log index b74a153..9dd9710 100644 --- a/import.log +++ b/import.log @@ -1,2 +1,3 @@ rubygem-highline-1_4_0-2_fc10:HEAD:rubygem-highline-1.4.0-2.fc10.src.rpm:1222904553 rubygem-highline-1_5_0-1_fc10:HEAD:rubygem-highline-1.5.0-1.fc10.src.rpm:1237204240 +rubygem-highline-1_5_1-1_fc12:F-12:rubygem-highline-1.5.1-1.fc12.src.rpm:1261445832 diff --git a/rubygem-highline.spec b/rubygem-highline.spec index 7c46c6b..1f182f5 100644 --- a/rubygem-highline.spec +++ b/rubygem-highline.spec @@ -1,13 +1,12 @@ -# Generated from highline-1.4.0.gem by gem2rpm -*- rpm-spec -*- -%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%define gemname highline -%define geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gemname highline +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} Summary: HighLine is a high-level command-line IO library Name: rubygem-%{gemname} -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Group: Development/Languages License: GPLv2+ or Ruby URL: http://highline.rubyforge.org @@ -78,6 +77,9 @@ rm -rf %{buildroot} %changelog +* Tue Dec 22 2009 Jeroen van Meeuwen - 1.5.1-1 +- New upstream version + * Sun Jul 26 2009 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 947e8ad..22bff41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b60d5199a9e19a9ac6d20a141cef98e5 highline-1.5.0.tgz +23d9221b5ffd55e5af35f5aa90590c57 highline-1.5.1.tgz From e4b70546e90ad99769751b595791b27e4b565551 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:21:58 +0000 Subject: [PATCH 3/4] Initialize branch EL-6 for rubygem-highline --- 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 484423d9f6381108c0018cf85f4141374704595e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:51:25 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 3 --- 4 files changed, 25 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 ee91978..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rubygem-highline -# $Id: Makefile,v 1.1 2008/10/01 18:58:16 kevin Exp $ -NAME := rubygem-highline -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 9dd9710..0000000 --- a/import.log +++ /dev/null @@ -1,3 +0,0 @@ -rubygem-highline-1_4_0-2_fc10:HEAD:rubygem-highline-1.4.0-2.fc10.src.rpm:1222904553 -rubygem-highline-1_5_0-1_fc10:HEAD:rubygem-highline-1.5.0-1.fc10.src.rpm:1237204240 -rubygem-highline-1_5_1-1_fc12:F-12:rubygem-highline-1.5.1-1.fc12.src.rpm:1261445832