rpms/ekiga/devel ekiga.spec,1.41,1.42

[Matej Cepl (mcepl)]

Author: mcepl

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

Modified Files:
	ekiga.spec 
Log Message:
enable dbus and cleaning .spec


Index: ekiga.spec
===================================================================
RCS file: /cvs/extras/rpms/ekiga/devel/ekiga.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ekiga.spec	20 Oct 2007 03:01:30 -0000	1.41
+++ ekiga.spec	13 Dec 2007 17:55:28 -0000	1.42
@@ -1,7 +1,7 @@
 Summary: A Gnome based SIP/H323 teleconferencing application
 Name: ekiga
 Version: 2.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.ekiga.org/
 Source0: http://download.gnome.org/sources/ekiga/2.0/%{name}-%{version}.tar.bz2
 License: GPL
@@ -15,7 +15,7 @@
 Requires: avahi >= 0.6.9
 Requires: avahi-glib >= 0.6.9
 Requires: evolution-data-server
-PreReq:    scrollkeeper
+Requires(pre):    scrollkeeper
 BuildRequires: gtk2-devel >= 2.0.0
 BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: libgnomeui-devel >= 2.0
@@ -35,9 +35,11 @@
 BuildRequires: evolution-data-server-devel
 BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
+BuildRequires: dbus-devel
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
-Obsoletes: gnomemeeting
+Obsoletes: gnomemeeting <= 1.2.3
+Provides: gnomemeeting
 
 %description
 Ekiga is a tool to communicate with video and audio over the internet.
@@ -49,7 +51,7 @@
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
 # We disable howl for now, waiting for ekiga 2.0 to ship with avahi support
-%configure --disable-scrollkeeper 
+%configure --disable-scrollkeeper  --enable-dbus
 make
 
 %install
@@ -74,18 +76,19 @@
 (yes | ekiga-config-tool --install-schemas) > /dev/null 2>&1
 scrollkeeper-update
 
-%postun
-scrollkeeper-update
+%postun -p /usr/bin/scrollkeeper-update
 
 %files -f ekiga.lang
 %defattr(-,root,root)
 %{_bindir}/ekiga
+%{_bindir}/ekiga-helper
 %{_bindir}/ekiga-config-tool
 %{_libdir}/bonobo/servers/ekiga.server
+%{_datadir}/dbus-1/services/net.ekiga.*.service
 %{_datadir}/applications/gnome-ekiga.desktop
 %{_datadir}/gnome/help/ekiga
 %{_datadir}/omf/ekiga
-%{_datadir}/omf/ekiga/*.omf
+# %{_datadir}/omf/ekiga/*.omf
 %{_datadir}/pixmaps/*
 %{_datadir}/man/*/*
 %{_datadir}/sounds/ekiga
@@ -93,6 +96,10 @@
 %{_sysconfdir}/gconf/schemas/ekiga.schemas
 
 %changelog
+* Thu Dec 13 2007 Matěj Cepl <mcepl at redhat.com> 2.0.11-2
+- compile with the D-Bus support
+- Making rpmlint silent.
+
 * Tue Sep 18 2007 Daniel Veillard <veillard at redhat.com> - 2.0.11-1
 - Upgrade to ekiga-2.0.11
 
@@ -147,7 +154,7 @@
 - Fix BuildRequires and Requires(post), Requires(postun)
 
 * Wed Mar 15 2006 Daniel Veillard <veillard at redhat.com> - 2.0.1-2
-- run 'ekiga-config-tool --install-schemas' in %post, c.f. #178929
+- run 'ekiga-config-tool --install-schemas' in %%post, c.f. #178929
 
 * Tue Mar 14 2006 Daniel Veillard <veillard at redhat.com> - 2.0.1-1
 - last minute bug rerelease 2.0.1