rpms/telepathy-mission-control/devel telepathy-mission-control-size_t_vs_guint.patch, NONE, 1.1 telepathy-mission-control.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sindre Pedersen Bjørdal (sindrepb)
fedora-extras-commits at redhat.com
Sat Jun 2 20:39:25 UTC 2007
Author: sindrepb
Update of /cvs/extras/rpms/telepathy-mission-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22788/devel
Modified Files:
.cvsignore sources
Added Files:
telepathy-mission-control-size_t_vs_guint.patch
telepathy-mission-control.spec
Log Message:
"adding libtelepathy-mission-control"
telepathy-mission-control-size_t_vs_guint.patch:
--- NEW FILE telepathy-mission-control-size_t_vs_guint.patch ---
Index: src/mcd-connection.c
===================================================================
--- src/mcd-connection.c (revision 40)
+++ src/mcd-connection.c (working copy)
@@ -774,7 +774,6 @@
_mcd_connection_setup_avatar (McdConnectionPrivate *priv)
{
gchar *filename, *mime_type, *token;
- GArray *avatar;
GError *error = NULL;
priv->avatars_proxy = tp_conn_get_interface (priv->tp_conn,
@@ -794,14 +793,19 @@
/* if the token is set, we have nothing to do */
if (!token && filename && g_file_test (filename, G_FILE_TEST_EXISTS))
{
- avatar = g_array_new (FALSE, FALSE, 1);
- g_return_if_fail (avatar != NULL);
- if (g_file_get_contents (filename, &avatar->data, &avatar->len, &error))
+ gchar *data = NULL;
+ size_t length;
+ if (g_file_get_contents (filename, &data, &length, &error))
{
- if (avatar->len > 0)
+ if (length > 0 && length < G_MAXUINT)
+ {
+ GArray avatar;
+ avatar.data = data;
+ avatar.len = (guint)length;
tp_conn_iface_avatars_set_avatar_async (priv->avatars_proxy,
- avatar, mime_type,
+ &avatar, mime_type,
set_avatar_cb, priv);
+ }
else
tp_conn_iface_avatars_clear_avatar_async(priv->avatars_proxy,
clear_avatar_cb,
@@ -813,7 +817,7 @@
g_debug ("%s: error reading %s: %s", G_STRFUNC, filename, error->message);
g_error_free (error);
}
- g_array_free (avatar, TRUE);
+ g_free(data);
}
g_free (filename);
--- NEW FILE telepathy-mission-control.spec ---
Name: telepathy-mission-control
Version: 4.22
Release: 2%{?dist}
Summary: Central control for Telepathy connection manager
Group: System Environment/Libraries
License: LGPL
URL: http://mission-control.sourceforge.net/
Source0: http://download.sourceforge.net/mission-control/%{name}-%{version}.tar.gz
#fix build on x86_64
Patch0: telepathy-mission-control-size_t_vs_guint.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtelepathy-devel, libxslt-devel, GConf2-devel
%description
Mission Control, or MC, is a Telepathy component providing a way for
"end-user" applications to abstract some of the details of connection
managers, to provide a simple way to manipulate a bunch of connection
managers at once, and to remove the need to have in each program the
account definitions and credentials.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: libtelepathy-devel, dbus-devel, dbus-glib-devel
%description devel
The %{name}-devel package contains libraries and header
files for developing applications that use %{name}.
%prep
%setup -q
%patch0 -p0
%build
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
#need to own this dir
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mission-control/profiles
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%{_bindir}/*
%dir %{_datadir}/mission-control/profiles
%{_libdir}/*.so.*
%{_datadir}/dbus-1/services/*.service
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%doc %{_datadir}/gtk-doc/html/libmissioncontrol
%doc %{_datadir}/gtk-doc/html/libmissioncontrol-server
%changelog
* Sat Jun 02 2007 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 4.22-2
- Add missing requires on -devel package
* Sat May 26 2007 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 4.22-1
- Initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/telepathy-mission-control/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2 Jun 2007 18:49:32 -0000 1.1
+++ .cvsignore 2 Jun 2007 20:38:51 -0000 1.2
@@ -0,0 +1 @@
+telepathy-mission-control-4.22.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/telepathy-mission-control/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 2 Jun 2007 18:49:32 -0000 1.1
+++ sources 2 Jun 2007 20:38:51 -0000 1.2
@@ -0,0 +1 @@
+aa8a8264c596c666f886f85356b56e09 telepathy-mission-control-4.22.tar.gz
More information about the fedora-extras-commits
mailing list