dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-agave-0.4.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+agave-0.4.2.tar.bz2

Makefile

@@ -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 $$/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)

agave.spec

@@ -1,18 +1,19 @@
 Name:           agave
-Version:        0.4.1
+Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?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,19 @@ fi
 %{_datadir}/%{name}
 %{_datadir}/icons/hicolor/*/*/*.png
 %{_datadir}/icons/hicolor/scalable/*/*.svg
+%{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/gnome/help/%{name}
+%{_datadir}/omf/%{name}
+
 
 
 %changelog
+* Sun Mar 04 2007 Aurelien Bompard <abompard@fedoraproject.org> 0.4.2-2
+- fix abusive cut-n-paste
+
+* Sat Mar 03 2007 Aurelien Bompard <abompard@fedoraproject.org> 0.4.2-1
+- version 0.4.2
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard@fedoraproject.org> 0.4.1-1
 - version 0.4.1
 - drop patch (applied upstream)

sources

@@ -1 +1 @@
-e038138eff31a5286e1e41ac0e3b0f04  agave-0.4.1.tar.bz2
+eb0801cc951c93f5a8fefb4b1c8afb09  agave-0.4.2.tar.bz2