forked from pool/pidgin
This commit is contained in:
parent
42841ab2af
commit
1b49c54ac2
14
includes.patch
Normal file
14
includes.patch
Normal file
@ -0,0 +1,14 @@
|
||||
Index: pidgin-2.0.1/pidgin/plugins/gevolution/gevolution.c
|
||||
===================================================================
|
||||
--- pidgin-2.0.1.orig/pidgin/plugins/gevolution/gevolution.c
|
||||
+++ pidgin-2.0.1/pidgin/plugins/gevolution/gevolution.c
|
||||
@@ -38,7 +38,8 @@
|
||||
|
||||
#include <libedata-book/Evolution-DataServer-Addressbook.h>
|
||||
|
||||
-#include <libebook/e-book-listener.h>
|
||||
+/* #include <libebook/e-book-listener.h> */
|
||||
+#include <libedataserver/e-component-listener.h>
|
||||
#include <libedata-book/e-data-book-factory.h>
|
||||
#include <bonobo/bonobo-main.h>
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 24 00:17:19 CEST 2007 - maw@suse.de
|
||||
|
||||
- Add includes.patch, fixing the build when new versions of
|
||||
evolution-data-server are installed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 12 01:54:48 CEST 2007 - ro@suse.de
|
||||
|
||||
|
28
pidgin.spec
28
pidgin.spec
@ -13,9 +13,9 @@
|
||||
Name: pidgin
|
||||
Summary: GTK+-Based Multiprotocol Instant Messaging Client
|
||||
Version: 2.0.1
|
||||
Release: 14
|
||||
License: GNU General Public License (GPL)
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Release: 20
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
URL: http://www.pidgin.im/
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source1: pidgin-NLD-smiley-theme.tar.bz2
|
||||
@ -27,6 +27,7 @@ Patch4: pidgin-nonblock-gwim.patch
|
||||
Patch5: pidgin-nonblock-common2.patch
|
||||
Patch7: pidgin-check.patch
|
||||
Patch8: pidgin-stringcompare.patch
|
||||
Patch9: includes.patch
|
||||
# Can use external libzephyr
|
||||
BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files
|
||||
# Product specific lines
|
||||
@ -133,11 +134,11 @@ Authors:
|
||||
|
||||
%package devel
|
||||
Summary: Development Headers, Documentation, and Libraries for Pidgin
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: %{name} = %{version} glib2-devel gtk2-devel libpurple-devel = %{version}
|
||||
%package -n libpurple
|
||||
Summary: Library for IM Clients Like Pidgin and Finch
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
# Existed before 10.3:
|
||||
Obsoletes: gaim
|
||||
# Was never been in SuSE:
|
||||
@ -148,33 +149,33 @@ Obsoletes: gaim-unstable
|
||||
Requires: cyrus-sasl-digestmd5 cyrus-sasl-plain
|
||||
%package -n libpurple-devel
|
||||
Summary: Development Headers, Documentation, and Libraries for libpurple
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: libpurple = %{version} NetworkManager-devel NetworkManager-glib glib2-devel gnome-keyring-devel libxml2-devel
|
||||
Requires: pkg-config
|
||||
Obsoletes: gaim-devel
|
||||
Obsoletes: gaim-unstable-devel
|
||||
%package -n libpurple-meanwhile
|
||||
Summary: Lotus Sametime Plugin for Pidgin Using the Meanwhile Library
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: libpurple = %{version}
|
||||
%package -n libpurple-mono
|
||||
Summary: Mono .NET Plugin Support for Pidgin
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: libpurple = %{version}
|
||||
%package -n finch
|
||||
Summary: Text-Based User Interface for Pidgin Instant Messaging Client
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: libpurple = %{version}
|
||||
Obsoletes: gaim-unstable-text
|
||||
%package -n finch-devel
|
||||
Summary: Headers etc. for finch Stuffs
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} ncurses-devel
|
||||
Requires: pkg-config
|
||||
Obsoletes: gaim-unstable-text-devel
|
||||
%package gaim-compat
|
||||
Summary: Gaim Compatibility Launchers for Pidgin and Finch
|
||||
Group: Productivity/Networking/AOLInstantMessenger
|
||||
Group: Productivity/Networking/Instant Messenger
|
||||
Requires: %{name} = %{version} finch = %{version}
|
||||
Conflicts: gaim < 2.0.0
|
||||
Conflicts: gaim-unstable < 2.0.0
|
||||
@ -748,6 +749,7 @@ Authors:
|
||||
The OpenQ Team
|
||||
|
||||
%prep
|
||||
#'
|
||||
%setup -q -a1 -a2
|
||||
%patch1 -p1
|
||||
# FIXME: Port this patch:
|
||||
@ -757,6 +759,7 @@ Authors:
|
||||
%patch5 -p1
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9 -p1
|
||||
# Change Myanmar/Myanmar to Myanmar:
|
||||
rename my_MM my po/my_MM.*
|
||||
sed -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac
|
||||
@ -936,6 +939,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/gaim-text
|
||||
|
||||
%changelog
|
||||
* Tue Jul 24 2007 - maw@suse.de
|
||||
- Add includes.patch, fixing the build when new versions of
|
||||
evolution-data-server are installed.
|
||||
* Tue Jun 12 2007 - ro@suse.de
|
||||
- avoid string compare with char literal (use strcmp)
|
||||
* Thu May 31 2007 - sbrabec@suse.cz
|
||||
|
Loading…
Reference in New Issue
Block a user