rpms/agave/devel .cvsignore, 1.3, 1.4 agave.spec, 1.4, 1.5 sources, 1.3, 1.4

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/agave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28706/devel

Modified Files:
	.cvsignore agave.spec sources 
Log Message:
* Sat Mar 03 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.4.2-1
- version 0.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Oct 2006 09:00:09 -0000	1.3
+++ .cvsignore	3 Mar 2007 11:21:23 -0000	1.4
@@ -1 +1 @@
-agave-0.4.1.tar.bz2
+agave-0.4.2.tar.bz2


Index: agave.spec
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/agave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- agave.spec	7 Oct 2006 09:00:09 -0000	1.4
+++ agave.spec	3 Mar 2007 11:21:23 -0000	1.5
@@ -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 @@
 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 @@
 
 
 %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 @@
 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 @@
 %{_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 <abompard at fedoraproject.org> 0.4.2-1
+- version 0.4.2
+
 * Sat Oct 07 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.4.1-1
 - version 0.4.1
 - drop patch (applied upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/agave/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2006 09:00:09 -0000	1.3
+++ sources	3 Mar 2007 11:21:23 -0000	1.4
@@ -1 +1 @@
-e038138eff31a5286e1e41ac0e3b0f04  agave-0.4.1.tar.bz2
+eb0801cc951c93f5a8fefb4b1c8afb09  agave-0.4.2.tar.bz2