From 1303bda6f1ca3f0ffd9c6090261861c67acbfa90 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 14:36:08 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 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..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 089bd3b3d97b80a87c321ab9d5159e38ddd63743 Mon Sep 17 00:00:00 2001 From: Aurelien Bompard Date: Sat, 3 Mar 2007 11:21:20 +0000 Subject: [PATCH 2/5] - version 0.4.2 --- .cvsignore | 2 +- agave.spec | 48 +++++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 520edf1..0c76be0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -agave-0.4.1.tar.bz2 +agave-0.4.2.tar.bz2 diff --git a/agave.spec b/agave.spec index 1310490..7e7b969 100644 --- a/agave.spec +++ b/agave.spec @@ -1,18 +1,19 @@ Name: agave -Version: 0.4.1 +Version: 0.4.2 Release: 1%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia License: GPL URL: http://home.gna.org/colorscheme/ -Source0: http://download.gna.org/colorscheme/releases/agave-0.4.1.tar.bz2 +Source0: http://download.gna.org/colorscheme/releases/agave-%{version}.tar.bz2 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 +BuildRequires: gettext, gnome-doc-utils, libglademm24-devel +BuildRequires: scrollkeeper %if "%{fedora}" >= "5" BuildRequires: libSM-devel %endif @@ -21,6 +22,10 @@ BuildRequires: libSM-devel Provides: colorscheme = %{version}-%{release} Obsoletes: colorscheme <= 0.3.91-2 +Requires(pre): GConf2 +Requires(post): scrollkeeper, GConf2 +Requires(preun): GConf2 +Requires(postun): scrollkeeper %description Have you ever been re-finishing a room in your home and found yourself asking @@ -35,18 +40,18 @@ allows you to generate a variety of colorschemes from a single starting color. %build -%configure +%configure --disable-schemas-install --disable-scrollkeeper make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +#export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --delete-original \ - --add-category X-Fedora \ --remove-category GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop @@ -60,17 +65,43 @@ make check || : rm -rf $RPM_BUILD_ROOT +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/[NAME].schemas >/dev/null || : + killall -HUP gconfd-2 >/dev/null 2>&1 || : +fi + %post +# Icons touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +# Scrollkeeper +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : +# GConf +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null || : +killall -HUP gconfd-2 >/dev/null 2>&1 || : %postun +# Icons touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +# Scrollkeeper +scrollkeeper-update -q || : +# GConf +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null || : + killall -HUP gconfd-2 >/dev/null 2>&1 || : +fi %files -f %{name}.lang @@ -81,9 +112,16 @@ fi %{_datadir}/%{name} %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/icons/hicolor/scalable/*/*.svg +%{_sysconfdir}/gconf/schemas/*.schemas +%{_datadir}/gnome/help/%{name} +%{_datadir}/omf/%{name} + %changelog +* Sat Mar 03 2007 Aurelien Bompard 0.4.2-1 +- version 0.4.2 + * Sat Oct 07 2006 Aurelien Bompard 0.4.1-1 - version 0.4.1 - drop patch (applied upstream) diff --git a/sources b/sources index 4f71f14..4ee9dba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e038138eff31a5286e1e41ac0e3b0f04 agave-0.4.1.tar.bz2 +eb0801cc951c93f5a8fefb4b1c8afb09 agave-0.4.2.tar.bz2 From 8f9a82022cb5c263778f07dba8d862c9c8b38478 Mon Sep 17 00:00:00 2001 From: Aurelien Bompard Date: Sun, 4 Mar 2007 09:14:41 +0000 Subject: [PATCH 3/5] - fix abusive cut-n-paste --- agave.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/agave.spec b/agave.spec index 7e7b969..0eb617d 100644 --- a/agave.spec +++ b/agave.spec @@ -1,6 +1,6 @@ Name: agave Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Generate a variety of colorschemes from a single starting color Group: Applications/Multimedia @@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/[NAME].schemas >/dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : killall -HUP gconfd-2 >/dev/null 2>&1 || : fi @@ -84,7 +84,7 @@ scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : # GConf export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : killall -HUP gconfd-2 >/dev/null 2>&1 || : %postun @@ -99,7 +99,7 @@ scrollkeeper-update -q || : if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/[NAME].schemas > /dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : killall -HUP gconfd-2 >/dev/null 2>&1 || : fi @@ -119,6 +119,9 @@ fi %changelog +* Sun Mar 04 2007 Aurelien Bompard 0.4.2-2 +- fix abusive cut-n-paste + * Sat Mar 03 2007 Aurelien Bompard 0.4.2-1 - version 0.4.2 From 692618462d4acddd809dece01d5655946d5577d6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:28 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 03b48b1..b355813 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 2800bbd218c9814830bdcf5e0dbcd1177cecc5fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:52 +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 b355813..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: agave -# $Id$ -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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6