diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 65c2c21..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -agave-0.4.4.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dccb07f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +agave-0.4.7.tar.bz2 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/agave.spec b/agave.spec index 6f262bb..2bcc157 100644 --- a/agave.spec +++ b/agave.spec @@ -1,5 +1,5 @@ Name: agave -Version: 0.4.4 +Version: 0.4.7 Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color @@ -7,21 +7,20 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://home.gna.org/colorscheme/ Source0: http://download.gna.org/colorscheme/releases/agave-%{version}.tar.bz2 -Patch1: agave-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # see http://home.gna.org/colorscheme/downloads.shtml for buildreqs BuildRequires: gtkmm24-devel >= 2.6, libgnomeui-devel >= 2.0, desktop-file-utils BuildRequires: cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel -BuildRequires: gettext, gnome-doc-utils, libglademm24-devel +BuildRequires: gettext, gnome-doc-utils, libglademm24-devel, intltool >= 0.35 BuildRequires: scrollkeeper %if 0%{?fedora} >= 5 BuildRequires: libSM-devel %endif # Renamed from colorscheme -Provides: colorscheme = %{version}-%{release} -Obsoletes: colorscheme <= 0.3.91-2 +#Provides: colorscheme = %{version}-%{release} +#Obsoletes: colorscheme <= 0.3.91-2 Requires(pre): GConf2 Requires(post): scrollkeeper, GConf2 @@ -38,7 +37,7 @@ allows you to generate a variety of colorschemes from a single starting color. %prep %setup -q -%patch1 -p1 -b .gcc43 + %build @@ -123,6 +122,11 @@ fi %changelog +* Sun Apr 04 2010 Vivek Shah - 0.4.7-1 +- Updated to new upstream version +- Fixes bug #556978 +- Removed unrequired patches + * Wed Nov 18 2009 Vivek Shah - 0.4.4-1 - Updated to new upstream version - Fixed gconf preun scriptlet diff --git a/sources b/sources index b09b1fb..d4d5e07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -376b4cfc4b63f3f42572207c84c9b182 agave-0.4.4.tar.bz2 +93097881f28dcae1eca2800a763f77c3 agave-0.4.7.tar.bz2