rpms/empathy/devel .cvsignore, 1.41, 1.42 empathy.spec, 1.81, 1.82 sources, 1.41, 1.42

[Brian Pepple]

Author: bpepple

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

Modified Files:
	.cvsignore empathy.spec sources 
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	19 Oct 2009 22:37:21 -0000	1.41
+++ .cvsignore	27 Oct 2009 01:42:18 -0000	1.42
@@ -1 +1 @@
-empathy-2.28.1.tar.bz2
+empathy-2.28.1.1.tar.bz2


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- empathy.spec	19 Oct 2009 22:37:21 -0000	1.81
+++ empathy.spec	27 Oct 2009 01:42:18 -0000	1.82
@@ -13,8 +13,8 @@
 %global libchamplain_version    0.4
 
 Name:		empathy
-Version:	2.28.1
-Release:	1%{?dist}
+Version:	2.28.1.1
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,7 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -43,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}
@@ -55,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
@@ -144,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
@@ -173,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
 
@@ -181,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 ||:
@@ -194,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
 
@@ -213,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/
@@ -222,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
@@ -244,8 +237,25 @@ 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
+
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
+- Another upstream crash fix
+
+* Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
+- Include a number of crash fixes from the stable branch
+
 * Mon Oct 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1-1
 - Update to 2.28.1.
+- Drop no-settings patch.  Fixed upstream.
+
+* Sat Oct 17 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.0.1-3
+- Include an upstream fix for a possible crash in the accounts dialog
 
 * Tue Oct 13 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.0.1-2
 - Require tp-idle and tp-butterfly.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	19 Oct 2009 22:37:22 -0000	1.41
+++ sources	27 Oct 2009 01:42:18 -0000	1.42
@@ -1 +1 @@
-021a05da920055d514cc51c4a538377f  empathy-2.28.1.tar.bz2
+e24600feffce66c3b494056f15efa653  empathy-2.28.1.1.tar.bz2