From fac56fab6e0471d69ca3345f52feacd8e3917068 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 02:43:30 +0000 Subject: [PATCH 1/7] Initialize branch F-7 for ack --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From fbb48438282e63d65b493bdbca10c5f564ed9b79 Mon Sep 17 00:00:00 2001 From: Ian Burrell Date: Tue, 19 Jun 2007 05:09:29 +0000 Subject: [PATCH 2/7] Update to 1.62; merge from devel --- .cvsignore | 2 +- ack.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2556230..d5713ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ack-1.60.tar.gz +ack-1.62.tar.gz diff --git a/ack.spec b/ack.spec index 35294d8..332f702 100644 --- a/ack.spec +++ b/ack.spec @@ -1,5 +1,5 @@ Name: ack -Version: 1.60 +Version: 1.62 Release: 2%{?dist} Summary: Grep-like text finder License: GPL or Artistic @@ -49,6 +49,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Jun 18 2007 Ian M. Burrell - 1.62-2 +- Disable tests since bug not fixed + +* Sun Jun 17 2007 Ian Burrell - 1.62-1 +- Update to 1.62 +- Enable tests + * Tue May 15 2007 Ian M. Burrell - 1.60-1 - add BuildRequires perl(ExtUtils::MakeMaker) diff --git a/sources b/sources index 9029743..003a7f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f828fb0a6bb2c81980aa5610ab263ebf ack-1.60.tar.gz +5697440e52734c659f08b72882a5b3c2 ack-1.62.tar.gz From 8a33970fd19e5e8536b52651e611a0bfd49ac089 Mon Sep 17 00:00:00 2001 From: Ian Burrell Date: Thu, 16 Aug 2007 23:31:46 +0000 Subject: [PATCH 3/7] Update to 1.64; add BuildRequires Test::More --- .cvsignore | 2 +- ack.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index d5713ae..0de1c4b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ack-1.62.tar.gz +ack-1.64.tar.gz diff --git a/ack.spec b/ack.spec index 332f702..a46dfe1 100644 --- a/ack.spec +++ b/ack.spec @@ -1,6 +1,6 @@ Name: ack -Version: 1.62 -Release: 2%{?dist} +Version: 1.64 +Release: 1%{?dist} Summary: Grep-like text finder License: GPL or Artistic Group: Development/Libraries @@ -9,6 +9,7 @@ Source0: http://www.cpan.org/modules/by-module/App/ack-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Test::More) BuildRequires: perl(File::Next) >= 0.40 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -49,26 +50,30 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog -* Mon Jun 18 2007 Ian M. Burrell - 1.62-2 +* Thu Aug 16 2007 Ian Burrell - 1.64-1 +- Update to 1.64 +- Add BuildRequires Test::More + +* Mon Jun 18 2007 Ian Burrell - 1.62-2 - Disable tests since bug not fixed * Sun Jun 17 2007 Ian Burrell - 1.62-1 - Update to 1.62 - Enable tests -* Tue May 15 2007 Ian M. Burrell - 1.60-1 +* Tue May 15 2007 Ian Burrell - 1.60-1 - add BuildRequires perl(ExtUtils::MakeMaker) -* Sat May 5 2007 - 1.60-4 +* Sat May 5 2007 Ian Burrell - 1.60-4 - Update to 1.60; requires File::Next 0.40 -* Mon Feb 12 2007 Ian M. Burrell - 1.56-4 +* Mon Feb 12 2007 Ian Burrell - 1.56-4 - Fix minor issues -* Tue Jan 30 2007 Ian M. Burrell - 1.56-3 +* Tue Jan 30 2007 Ian Burrell - 1.56-3 - Fix source URL -* Mon Jan 29 2007 - 1.56-2 +* Mon Jan 29 2007 Ian Burrell - 1.56-2 - Rename to ack * Mon Jan 29 2007 Ian Burrell 1.56-1 diff --git a/sources b/sources index 003a7f9..64cd310 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5697440e52734c659f08b72882a5b3c2 ack-1.62.tar.gz +a3459623fedd1fa1e618799ff1ae07be ack-1.64.tar.gz From ad464361d449ba5ef19f584dfb3c31662f26f6c6 Mon Sep 17 00:00:00 2001 From: Ian Burrell Date: Thu, 17 Jan 2008 20:49:37 +0000 Subject: [PATCH 4/7] Update to 1.76 --- .cvsignore | 2 +- ack.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0de1c4b..d2c8ae6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ack-1.64.tar.gz +ack-1.76.tar.gz diff --git a/ack.spec b/ack.spec index a46dfe1..c4f441b 100644 --- a/ack.spec +++ b/ack.spec @@ -1,5 +1,5 @@ Name: ack -Version: 1.64 +Version: 1.76 Release: 1%{?dist} Summary: Grep-like text finder License: GPL or Artistic @@ -36,7 +36,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %check # Disabled because tests fail when run without terminal # See http://rt.cpan.org/Public/Bug/Display.html?id=24670 -#make test +make test %clean rm -rf $RPM_BUILD_ROOT @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Thu Jan 17 2008 Ian Burrell - 1.76-1 +- Update to 1.76 + * Thu Aug 16 2007 Ian Burrell - 1.64-1 - Update to 1.64 - Add BuildRequires Test::More diff --git a/sources b/sources index 64cd310..361a5c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3459623fedd1fa1e618799ff1ae07be ack-1.64.tar.gz +c6ac41f943c36b826b7cbe27194ce5aa ack-1.76.tar.gz From 64ccc483becd3db53d4f2eefafeada8cc391d68b Mon Sep 17 00:00:00 2001 From: Ian Burrell Date: Mon, 24 Mar 2008 18:11:10 +0000 Subject: [PATCH 5/7] update to 1.78 --- .cvsignore | 2 +- ack.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index d2c8ae6..784d9bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ack-1.76.tar.gz +ack-1.78.tar.gz diff --git a/ack.spec b/ack.spec index c4f441b..985458f 100644 --- a/ack.spec +++ b/ack.spec @@ -1,8 +1,8 @@ Name: ack -Version: 1.76 +Version: 1.78 Release: 1%{?dist} Summary: Grep-like text finder -License: GPL or Artistic +License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/ack/ Source0: http://www.cpan.org/modules/by-module/App/ack-%{version}.tar.gz @@ -34,8 +34,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* %check -# Disabled because tests fail when run without terminal -# See http://rt.cpan.org/Public/Bug/Display.html?id=24670 make test %clean @@ -50,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog +* Mon Mar 24 2008 Ian M. Burrell - 1.78-1 +- Update to 1.78 + * Thu Jan 17 2008 Ian Burrell - 1.76-1 - Update to 1.76 diff --git a/sources b/sources index 361a5c7..3608173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6ac41f943c36b826b7cbe27194ce5aa ack-1.76.tar.gz +a7072e4e05a21422a87478ad50c7ecfe ack-1.78.tar.gz From 907faf0a2ffed6ccf8bfba56904be6eb9aac54af Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:44 +0000 Subject: [PATCH 6/7] 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 133db724fe0c890f35b76b79bea0aa7ed21833d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:34:13 +0000 Subject: [PATCH 7/7] 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 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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7