From 55f44f385648610773b41f08b9f145249b7e0fc8 Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 03:09:36 +0000 Subject: [PATCH 1/5] Fix braindead import typo artifact in the default generated Makefile. Oh well, the fedora extras commits list needs a workout anyway... --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 908340f..e9516a2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for source rpm: aalib -# $Id$ +# $Id: Makefile,v 1.1 2004/11/08 03:59:59 cvsextras Exp $ NAME := aalib SPECFILE = $(firstword $(wildcard *.spec)) @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { 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 +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)) From 8416720c0f7d43187823e65bfb1bf7308890abec Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Thu, 16 Dec 2004 20:40:23 +0000 Subject: [PATCH 2/5] Fix undefined epoch in aalib-devel dependency --- aalib.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/aalib.spec b/aalib.spec index 4cd9cac..85c732f 100644 --- a/aalib.spec +++ b/aalib.spec @@ -3,7 +3,7 @@ Summary: An ASCII art library. Name: aalib Version: 1.4.0 -Release: 0.%{rc_subver}.2 +Release: 0.%{rc_subver}.3 License: LGPL Group: System Environment/Libraries URL: http://aa-project.sourceforge.net/aalib/ @@ -16,7 +16,7 @@ BuildRequires: slang-devel XFree86-devel gpm-devel %package devel Summary: aalib development files Group: Development/Libraries -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: XFree86-devel, slang-devel, gpm-devel Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -90,6 +90,9 @@ fi %{_datadir}/aclocal/aalib.m4 %changelog +* Thu Dec 16 2004 Michael Schwendt 1.4.0-0.rc5.3 +- If Epoch is dropped, %%epoch must not be used anywhere else. + * Wed Nov 10 2004 Matthias Saou 1.4.0-0.rc5.2 - Bump release for compatibility (still, it'll break *sigh*). - Fix possible non zero exit status from %%install. From 1e12e16cbba1fb4f1fd6d4ad838b339ce29c55fd Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 13 Dec 2007 03:07:02 +0000 Subject: [PATCH 3/5] Initialize branch EL-4 for aalib --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From d3180f66dd8df8d4338f8ca58434989feac90a6a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:00 +0000 Subject: [PATCH 4/5] 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 e9516a2..ddc874d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: aalib -# $Id: Makefile,v 1.1 2004/11/08 03:59:59 cvsextras Exp $ +# $Id: Makefile,v 1.2 2004/11/24 03:09:36 gafton Exp $ NAME := aalib 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 64a2a4586e8813ee7c0ac682370ef1bc994c140b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:29:57 +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 ddc874d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aalib -# $Id: Makefile,v 1.2 2004/11/24 03:09:36 gafton Exp $ -NAME := aalib -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 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4