rpms/gossip/FC-4 .cvsignore, 1.3, 1.4 gossip.spec, 1.6, 1.7 sources, 1.3, 1.4

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/gossip/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3089

Modified Files:
	.cvsignore gossip.spec sources 
Log Message:
* Sat Feb 18 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
- Update to 0.10.
- Add help files.
- Add scriptlets & BR for scrollkeeper.
- Remove unnecessary BR (libxml2-devel, libglade2-devel, GConf2-devel,
  gnome-vfs2-devel, libgcrypt-devel).
- Add BR for xorg-x11-devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Aug 2005 18:21:01 -0000	1.3
+++ .cvsignore	18 Feb 2006 16:04:07 -0000	1.4
@@ -1 +1 @@
-gossip-0.9.tar.bz2
+gossip-0.10.tar.bz2


Index: gossip.spec
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-4/gossip.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gossip.spec	31 Aug 2005 19:17:09 -0000	1.6
+++ gossip.spec	18 Feb 2006 16:04:07 -0000	1.7
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           gossip
-Version:        0.9
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Gnome Jabber Client
 
 Group:          Applications/Communications
@@ -12,23 +12,23 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	loudmouth-devel >= 1.0
-BuildRequires:	GConf2-devel
-BuildRequires:	libglade2-devel
 BuildRequires:	libgnomeui-devel
-BuildRequires:	gnome-vfs2-devel
+BuildRequires:	xorg-x11-devel
 BuildRequires:	libxslt-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	libgcrypt-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	aspell-devel
 BuildRequires:	gettext
+BuildRequires:	scrollkeeper
 
 %if %{with_dbus}
 BuildRequires:	dbus-devel >= 0.31
 %endif
 
+Requires(pre):	GConf2
 Requires(post):	GConf2
-Requires(preun): GConf2 
+Requires(post):	scrollkeeper
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
 
 %description
 Gossip aims at making Jabber easy to use and tries to give GNOME users a
@@ -67,16 +67,34 @@
 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 || :
+fi
+
+
 %post
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
+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 || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
 
 %preun
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+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 || :
+fi
+
+
+%postun
+scrollkeeper-update -q || :
 
 
 %files -f %{name}.lang
@@ -96,9 +114,19 @@
 %{_datadir}/%{name}/protocols/*
 %dir %{_datadir}/sounds/%{name}
 %{_datadir}/sounds/%{name}/*.wav
+%{_datadir}/omf/%{name}/
+%{_datadir}/gnome/help/%{name}/
 
 
 %changelog
+* Sat Feb 18 2006 Brian Pepple <bdpepple at ameritech.net> - 0.10-1
+- Update to 0.10.
+- Add help files.
+- Add scriptlets & BR for scrollkeeper.
+- Remove unnecessary BR (libxml2-devel, libglade2-devel, GConf2-devel,
+  gnome-vfs2-devel, libgcrypt-devel).
+- Add BR for xorg-x11-devel.
+
 * Wed Aug 31 2005 Brian Pepple <bdpepple at ameritech.net> - 0.9-3
 - Add missing COPYING file to docs.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gossip/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Aug 2005 18:21:01 -0000	1.3
+++ sources	18 Feb 2006 16:04:07 -0000	1.4
@@ -1 +1 @@
-af017e1652a96009d30eeeead2dd4ef9  gossip-0.9.tar.bz2
+57a3a1a84ca4451868df2f151bae50aa  gossip-0.10.tar.bz2