SHA256
1
0
forked from pool/pidgin-sipe

Accepting request 114616 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/114616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin-sipe?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2012-04-20 13:19:27 +00:00 committed by Git OBS Bridge
parent f1e24935c3
commit 14a911b124
5 changed files with 15 additions and 29 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2244925a3a7c9c03504e6fd77cb5648544a7f4ad298fbaa52e4dd3af28ec7fd9
size 741684

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30d1587177311752520458abd5a0e5b998b2e07dab9b4fb23576ac7216387d3b
size 748761

View File

@ -1,21 +0,0 @@
--- a/src/core/sipe-cal.c
+++ b/src/core/sipe-cal.c
@@ -3,7 +3,7 @@
*
* pidgin-sipe
*
- * Copyright (C) 2010-11 SIPE Project <http://sipe.sourceforge.net/>
+ * Copyright (C) 2010-12 SIPE Project <http://sipe.sourceforge.net/>
* Copyright (C) 2009 pier11 <pier11@operamail.com>
*
*
@@ -674,7 +674,7 @@ sipe_cal_get_status(struct sipe_buddy *buddy,
const char* free_busy;
int ret = SIPE_CAL_NO_DATA;
time_t state_since;
- int index;
+ int index = -1;
if (!buddy || !buddy->cal_start_time || !buddy->cal_granularity) {
SIPE_DEBUG_INFO("sipe_cal_get_status: no calendar data1 for %s, exiting",

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Apr 9 18:51:47 UTC 2012 - dimstar@opensuse.org
- Update to version 1.13.1:
+ Detect incompatible encryption level with Lync
+ purple: add URI validity check to Add Buddy callback
+ Various build fixes
+ Updated translations.
- Drop pidgin-sipe-gcc47.patch: fixed upstream.
-------------------------------------------------------------------
Sat Mar 24 23:13:09 UTC 2012 - dimstar@opensuse.org

View File

@ -19,16 +19,14 @@
%define build_telepathy 0
Name: pidgin-sipe
Version: 1.13.0
Version: 1.13.1
Release: 0
# FIXME: enable telepathy plugin when it'll be available (not in 1.11.0)
Summary: Pidgin protocol plugin to connect to MS Office Communicator
License: GPL-2.0+
Group: Productivity/Networking/Instant Messenger
Url: http://sipe.sourceforge.net/
Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.13.0/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM pidgin-sipe-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7; fixed in git
Patch0: pidgin-sipe-gcc47.patch
Source: http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.13.1/%{name}-%{version}.tar.bz2
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 2.12.0
BuildRequires: gmime-devel
@ -98,7 +96,6 @@ various products:
%prep
%setup -q
%patch0 -p1
translation-update-upstream
%build