From cf6eb1f5d48f66afe1cf9a5e455920846ad78273 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:46:34 +0000 Subject: [PATCH 1/5] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 61fc7434ebaf17d051eb000f4cb62f0f09a2ab8a Mon Sep 17 00:00:00 2001 From: Vivek Shah Date: Wed, 18 Nov 2009 18:07:32 +0000 Subject: [PATCH 2/5] - Updated to new upstream version - Fixed gconf preun scriptlet --- .cvsignore | 2 +- agave-gcc43.patch | 5 ++--- agave.spec | 13 +++++++++++-- sources | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0c76be0..65c2c21 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -agave-0.4.2.tar.bz2 +agave-0.4.4.tar.bz2 diff --git a/agave-gcc43.patch b/agave-gcc43.patch index 9f23771..ea6edf1 100644 --- a/agave-gcc43.patch +++ b/agave-gcc43.patch @@ -1,6 +1,5 @@ -diff -up agave-0.4.2/src/paletteparser/palette.h.gcc43 agave-0.4.2/src/paletteparser/palette.h ---- agave-0.4.2/src/paletteparser/palette.h.gcc43 2008-03-27 11:19:26.000000000 -0400 -+++ agave-0.4.2/src/paletteparser/palette.h 2008-03-27 11:37:55.000000000 -0400 +--- agave-0.4.4/src/paletteparser/palette.h.gcc43 2009-11-18 21:22:41.778134993 +0530 ++++ agave-0.4.4/src/paletteparser/palette.h 2009-11-18 21:23:15.044136768 +0530 @@ -26,6 +26,7 @@ #ifndef __PP_PALETTE_H #define __PP_PALETTE_H diff --git a/agave.spec b/agave.spec index 5f527d3..6f262bb 100644 --- a/agave.spec +++ b/agave.spec @@ -1,6 +1,6 @@ Name: agave -Version: 0.4.2 -Release: 9%{?dist} +Version: 0.4.4 +Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia @@ -97,6 +97,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi # Scrollkeeper scrollkeeper-update -q || : + +%preun # GConf if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -121,6 +123,13 @@ fi %changelog +* Wed Nov 18 2009 Vivek Shah - 0.4.4-1 +- Updated to new upstream version +- Fixed gconf preun scriptlet + +* Fri Jul 24 2009 Fedora Release Engineering - 0.4.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 0.4.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 4ee9dba..b09b1fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb0801cc951c93f5a8fefb4b1c8afb09 agave-0.4.2.tar.bz2 +376b4cfc4b63f3f42572207c84c9b182 agave-0.4.4.tar.bz2 From 3e03b0db5a02319bd7e2ec76842ea2b18db16369 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:27 +0000 Subject: [PATCH 3/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 047092b9c8515638514354172b50a2719561a7f0 Mon Sep 17 00:00:00 2001 From: Vivek Shah Date: Sun, 4 Apr 2010 08:38:49 +0000 Subject: [PATCH 4/5] - Updated to new upstream version - Fixes bug #556978 --- .cvsignore | 2 +- agave.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 65c2c21..dccb07f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -agave-0.4.4.tar.bz2 +agave-0.4.7.tar.bz2 diff --git a/agave.spec b/agave.spec index 6f262bb..c0f28eb 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,6 @@ allows you to generate a variety of colorschemes from a single starting color. %prep %setup -q -%patch1 -p1 -b .gcc43 %build @@ -123,6 +121,11 @@ fi %changelog +* Sun Apr 04 2010 Vivek Shah - 0.4.7-1 +- Updated to new upstream version +- Fixes bug #556978 +- Removed unnecessary 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 From bacd0c2677e5661cd385fcaf6f2444358ea7fea5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:51 +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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11