From 0243af4ab15e42fca3fefba68dab562b8348b08c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 11:55:28 +0000 Subject: [PATCH 1/5] Initialize branch F-9 for agave --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 677dc65029ef9fc34425913f32a3dcedbd7c0cda Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 7 Jul 2008 16:50:16 +0000 Subject: [PATCH 2/5] fix conditional comparison --- agave.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/agave.spec b/agave.spec index 5b29b6b..8874b21 100644 --- a/agave.spec +++ b/agave.spec @@ -1,6 +1,6 @@ Name: agave Version: 0.4.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia @@ -15,7 +15,7 @@ BuildRequires: gtkmm24-devel >= 2.6, libgnomeui-devel >= 2.0, desktop-file-util BuildRequires: cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel BuildRequires: gettext, gnome-doc-utils, libglademm24-devel BuildRequires: scrollkeeper -%if "%{fedora}" >= "5" +%if 0%{?fedora} >= 5 BuildRequires: libSM-devel %endif @@ -121,6 +121,9 @@ fi %changelog +* Mon JUl 7 2008 Tom "spot" Callaway - 0.4.2-8 +- fix conditional comparison + * Thu Mar 27 2008 Christopher Aillon - 0.4.2-7 - Actually build against GCC 4.3 From 9c2eeac4bd740c25e6b04316cc13482e7d53977d Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 7 Jul 2008 16:52:29 +0000 Subject: [PATCH 3/5] fix typo --- agave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agave.spec b/agave.spec index 8874b21..c0f2cc4 100644 --- a/agave.spec +++ b/agave.spec @@ -121,7 +121,7 @@ fi %changelog -* Mon JUl 7 2008 Tom "spot" Callaway - 0.4.2-8 +* Mon Jul 7 2008 Tom "spot" Callaway - 0.4.2-8 - fix conditional comparison * Thu Mar 27 2008 Christopher Aillon - 0.4.2-7 From 328eae962f6cc143a70a12b03ac3733dcb792cf3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:27 +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 03b48b1..6364b0f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: agave -# $Id$ +# $Id: Makefile,v 1.1 2006/07/23 15:42:19 abompard Exp $ NAME := agave 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 908c85538ad1d23c29ea25e9fb0f969e253dd85b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:50 +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 6364b0f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: agave -# $Id: Makefile,v 1.1 2006/07/23 15:42:19 abompard Exp $ -NAME := agave -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9