From 9e77ce31de3eebaa1184568c6fa06991f7787719 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:20 +0000 Subject: [PATCH 1/6] 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 8a623a4..e228427 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ack -# $Id$ +# $Id: Makefile,v 1.1 2007/02/13 19:03:49 notting Exp $ NAME := ack 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 1cd7bdace26d875a4c718030a59e265c67c68c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Fri, 4 Dec 2009 01:58:34 +0000 Subject: [PATCH 2/6] - rebuild against perl 5.10.1 --- ack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ack.spec b/ack.spec index b17d9ae..8acc42c 100644 --- a/ack.spec +++ b/ack.spec @@ -1,6 +1,6 @@ Name: ack Version: 1.86 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Grep-like text finder License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Fri Dec 4 2009 Stepan Kasal - 1.86-4 +- rebuild against perl 5.10.1 + * Fri Jul 24 2009 Fedora Release Engineering - 1.86-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 09ee0ac500116bcfbebe182a9ef272852bfcdacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Tue, 1 Jun 2010 12:31:06 +0000 Subject: [PATCH 3/6] - Mass rebuild with perl-5.12.0 --- ack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ack.spec b/ack.spec index 8acc42c..1aa8bcc 100644 --- a/ack.spec +++ b/ack.spec @@ -1,6 +1,6 @@ Name: ack Version: 1.86 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Grep-like text finder License: GPL+ or Artistic Group: Development/Libraries @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Tue Jun 01 2010 Marcela Maslanova - 1.86-5 +- Mass rebuild with perl-5.12.0 + * Fri Dec 4 2009 Stepan Kasal - 1.86-4 - rebuild against perl 5.10.1 From 6d148c9b0124eeea50aa002b328c73e3749062e7 Mon Sep 17 00:00:00 2001 From: Ian Burrell Date: Wed, 16 Jun 2010 21:34:05 +0000 Subject: [PATCH 4/6] Update to 1.92 --- .cvsignore | 2 +- ack.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9b0cf9c..74ef206 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ack-1.86.tar.gz +ack-1.92.tar.gz diff --git a/ack.spec b/ack.spec index 1aa8bcc..5019e47 100644 --- a/ack.spec +++ b/ack.spec @@ -1,6 +1,6 @@ Name: ack -Version: 1.86 -Release: 5%{?dist} +Version: 1.92 +Release: 1%{?dist} Summary: Grep-like text finder License: GPL+ or Artistic Group: Development/Libraries @@ -45,9 +45,11 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorlib}/* %{_bindir}/ack %{_mandir}/man1/* -%{_mandir}/man3/* %changelog +* Wed Jun 16 2010 Ian Burrell - 1.92-1 +- Update to 1.92 + * Tue Jun 01 2010 Marcela Maslanova - 1.86-5 - Mass rebuild with perl-5.12.0 diff --git a/sources b/sources index ea55f0a..c1ad9a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bef9bb58d4b3cf542d178abe46f0985a ack-1.86.tar.gz +c25b5a16d0a27386a75c91d531b86cea ack-1.92.tar.gz From 445e74ef051ef56595303da3b1bd85ecdd068eb4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:34:20 +0000 Subject: [PATCH 5/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 e228427..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ack -# $Id: Makefile,v 1.1 2007/02/13 19:03:49 notting Exp $ -NAME := ack -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) From f10719c5dff4dd504933061408a2699529eb1c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 4 Aug 2010 10:39:21 +0200 Subject: [PATCH 6/6] * Wed Aug 4 2010 Marcela Maslanova - 1.92-2 - rebuild with perl-5.12.1 again --- ack.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ack.spec b/ack.spec index 5019e47..54cb867 100644 --- a/ack.spec +++ b/ack.spec @@ -1,6 +1,6 @@ Name: ack Version: 1.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Grep-like text finder License: GPL+ or Artistic Group: Development/Libraries @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Wed Aug 4 2010 Marcela Maslanova - 1.92-2 +- rebuild with perl-5.12.1 again + * Wed Jun 16 2010 Ian Burrell - 1.92-1 - Update to 1.92