rpms/ekiga/devel ekiga.spec,1.57,1.58

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/ekiga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31291

Modified Files:
	ekiga.spec 
Log Message:
- Remove gnomemeeting obsolete, package review updates



Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ekiga.spec	9 Oct 2008 05:03:28 -0000	1.57
+++ ekiga.spec	9 Oct 2008 20:23:23 -0000	1.58
@@ -1,7 +1,7 @@
 Summary:	A Gnome based SIP/H323 teleconferencing application
 Name:		ekiga
 Version:	3.0.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://www.ekiga.org/
 Source0:	ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.0/%{name}-%{version}.tar.bz2
 License:	GPLv2+
@@ -10,7 +10,7 @@
 
 Requires:	evolution-data-server
 Requires:	dbus
-Requires:	GConf2, scrollkeeper
+Requires:	GConf2
 BuildRequires:	gtk2-devel >= 2.12
 BuildRequires:	GConf2-devel >= 2.2.0
 BuildRequires:	libgnomeui-devel >= 2.0
@@ -34,7 +34,12 @@
 BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	desktop-file-utils
 BuildRequires:	libsigc++20-devel
-Obsoletes:	gnomemeeting
+
+Requires(pre):	GConf2
+Requires(post):	GConf2
+Requires(preun):GConf2
+Requires(post):	scrollkeeper
+Requires(postun):scrollkeeper
 
 %description
 Ekiga is a tool to communicate with video and audio over the internet.
@@ -84,14 +89,39 @@
 %clean
 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/ekiga.schemas > /dev/null || :
+fi
+
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ekiga.schemas > /dev/null 2>&1
-gconftool-2 --shutdown
-(yes | ekiga-config-tool --install-schemas) > /dev/null 2>&1
-scrollkeeper-update
+gconftool-2 --makefile-install-rule \
+%{_sysconfdir}/gconf/schemas/ekiga.schemas > /dev/null || :
+
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%preun
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/ekiga.schemas > /dev/null || :
+fi
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+scrollkeeper-update -q || :
 
 %files -f ekiga.lang
 %defattr(-,root,root)
@@ -108,6 +138,9 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Thu Oct 9 2008 Peter Robinson <pbrobinson at gmail.com> - 3.0.0-5
+- Remove gnomemeeting obsolete, package review updates
+
 * Thu Oct 9 2008 Matthias Clasen  <mclasen at redhat.com> - 3.0.0-4
 - Save some space