From fbb3e30deb70f05c0da3af304ab9384277658d2f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 02:15:01 +0000 Subject: [PATCH 1/5] 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 34d1de7..b6a1749 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := perl-Software-License 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 1eecc47f86107d69bc408140e8f50375c235f4b6 Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Wed, 2 Jun 2010 03:23:26 +0000 Subject: [PATCH 2/5] - update to 0.101410 release --- .cvsignore | 5 +---- perl-Software-License.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index afd591c..0f1abb7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -.build*.log -*.rpm -noarch -Software-License-0.012.tar.gz +Software-License-0.101410.tar.gz diff --git a/perl-Software-License.spec b/perl-Software-License.spec index 21f034a..b80c956 100644 --- a/perl-Software-License.spec +++ b/perl-Software-License.spec @@ -1,6 +1,6 @@ Name: perl-Software-License -Version: 0.012 -Release: 2%{?dist} +Version: 0.101410 +Release: 3%{?dist} Summary: Package that provides templated software licenses License: GPL+ or Artistic Group: Development/Libraries @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Wed Jun 02 2010 Iain Arnell 0.101410-3 +- update to 0.101410 release + * Sun Jul 26 2009 Fedora Release Engineering - 0.012-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index ee65899..cf6a15d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8232072eec55b331b0a56adc253dfa12 Software-License-0.012.tar.gz +799cd90597162a8fdda15c8057e01321 Software-License-0.101410.tar.gz From 20e16f94b7022cb3920c3500225f7d7902142bc5 Mon Sep 17 00:00:00 2001 From: Iain Arnell Date: Wed, 2 Jun 2010 03:25:11 +0000 Subject: [PATCH 3/5] fix release number --- perl-Software-License.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-Software-License.spec b/perl-Software-License.spec index b80c956..c4139d6 100644 --- a/perl-Software-License.spec +++ b/perl-Software-License.spec @@ -1,6 +1,6 @@ Name: perl-Software-License Version: 0.101410 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Package that provides templated software licenses License: GPL+ or Artistic Group: Development/Libraries @@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog -* Wed Jun 02 2010 Iain Arnell 0.101410-3 +* Wed Jun 02 2010 Iain Arnell 0.101410-1 - update to 0.101410 release * Sun Jul 26 2009 Fedora Release Engineering - 0.012-2 From 58c88394af6a66e6fccd19fbeb5dc35c81213c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Sat, 26 Jun 2010 15:52:46 +0000 Subject: [PATCH 4/5] Initialize branch EL-6 for perl-Software-License --- 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 7316a4dfd6a02678806593261a5efe34b019ba6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 07:57:07 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 b6a1749..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: perl-Software-License -# $Id$ -NAME := perl-Software-License -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