rpms/empathy/F-12 empathy.spec,1.85,1.86

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15659

Modified Files:
	empathy.spec 
Log Message:
* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
- Disable panel applets, since they are unmaintained and being dropped from Empathy.



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- empathy.spec	26 Oct 2009 18:39:59 -0000	1.85
+++ empathy.spec	26 Oct 2009 21:54:39 -0000	1.86
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -44,7 +44,6 @@ BuildRequires:	GConf2-devel
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= %{glib2_min_version}
 BuildRequires:	gnome-doc-utils >= 0.17.3
-BuildRequires:	gnome-panel-devel
 BuildRequires:	libcanberra-devel >= %{libcanberra_version}
 BuildRequires:	webkitgtk-devel >= %{webkit_version}
 BuildRequires:	gtk2-devel >= %{gtk2_min_version}
@@ -56,6 +55,7 @@ BuildRequires:	telepathy-glib-devel >= %
 BuildRequires:	telepathy-farsight-devel
 BuildRequires:	libnotify-devel >= %{libnotify_version}
 BuildRequires:	NetworkManager-glib-devel >= %{network_manager_version}
+BuildRequires:	gnome-keyring-devel
 BuildRequires:  libchamplain-gtk-devel >= %{libchamplain_version}
 BuildRequires:  clutter-gtk-devel
 BuildRequires:  geoclue-devel >= 0.11
@@ -145,7 +145,7 @@ rm data/empathy.schemas
 %build
 ## GCC complains about some unused functions, so we forcibly show those as
 ## simple warnings instead of build-halting errors.
-%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes
+%configure --with-compile-warnings=yes --disable-static --enable-map=yes --enable-location=yes --enable-megaphone=no --enable-nothere=no
 ## RPATHs are yucky.
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -174,7 +174,6 @@ rm -rf %{buildroot}
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -182,7 +181,6 @@ fi
 %post
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 gconftool-2 --makefile-install-rule	\
-	%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
@@ -195,7 +193,6 @@ touch --no-create %{_datadir}/icons/hico
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
 	gconftool-2 --makefile-uninstall-rule	\
-		%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas	\
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||:
 fi
 
@@ -214,7 +211,6 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
-%{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
 %{_bindir}/empathy-logs
 %{_datadir}/empathy/
@@ -223,10 +219,6 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service
 %{_datadir}/telepathy/clients/Empathy.client
-%{_libexecdir}/megaphone-applet
-%{_libexecdir}/nothere-applet
-%{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_libdir}/bonobo/servers/GNOME_NotHere_Applet.server
 %{_mandir}/man1/empathy*.1.gz
 
 %files	libs
@@ -245,6 +237,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
+- Disable panel applets, since they are unmaintained and being dropped from Empathy.
+
 * Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-1
 - Update to 2.28.1.1.
 - See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.1.1.news