From fbc203eb18f127fb362e03e47ab7eccd299e75adbeb00b578b1666b43b4e7ed9 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 8 Jul 2011 07:38:03 +0000 Subject: [PATCH] Accepting request 75683 from GNOME:Apps Pushing bits of G:A OBS-URL: https://build.opensuse.org/request/show/75683 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=77 --- pidgin-prefs.xml | 6 ++++ pidgin.changes | 20 ++++++++++++ pidgin.spec | 83 ++++++++++++++++++++++++++++++++++++------------ 3 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 pidgin-prefs.xml diff --git a/pidgin-prefs.xml b/pidgin-prefs.xml new file mode 100644 index 0000000..4a54a36 --- /dev/null +++ b/pidgin-prefs.xml @@ -0,0 +1,6 @@ + + diff --git a/pidgin.changes b/pidgin.changes index 09aa419..436e24d 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jul 6 17:13:47 CEST 2011 - vuntz@opensuse.org + +- Update summary and description of the main package and libpurple. +- Remove libpurple-lang Recommands from main package, as we know it + already depend on libpurple, which will bring libpurple-lang. +- Create a libpurple-branding-upstream package (on 12.1 and later + only): + + this contains %{_sysconfdir}/purple/prefs.xml, which is the + pidgin-prefs.xml we ship as source. This only includes + documentation on how to change the default configuration. + + this will let people know how to change the default + configuration of libpurple, and potentially other clients. + + since there is potentially also pidgin-related content in the + same file, we also make libpurple-branding-upsream act as + pidgin-branding-upstream (with Provides, Conflicts, Supplements + that are usual for a branding package). +- Make libpurple own %{_sysconfdir}/purple/, which is where the + default configuration lives. + ------------------------------------------------------------------- Tue Jul 5 14:13:18 UTC 2011 - seife+obs@b1-systems.com diff --git a/pidgin.spec b/pidgin.spec index 4dd8f7d..2be4cf0 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -24,7 +24,7 @@ %endif Name: pidgin -Summary: GTK+-Based Multiprotocol Instant Messaging Client +Summary: Multiprotocol Instant Messaging Client Version: 2.9.0 Release: 4 License: GPLv2+ @@ -33,6 +33,7 @@ Url: http://www.pidgin.im/ Source: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 Source1: pidgin-NLD-smiley-theme.tar.bz2 Source2: pidgin-Tango-smiley-theme.tar.bz2 +Source3: pidgin-prefs.xml Patch1: pidgin-gnome-keyring.patch Patch3: pidgin-nonblock-common.patch Patch4: pidgin-nonblock-gwim.patch @@ -143,9 +144,6 @@ BuildRequires: avahi-devel avahi-glib Requires: openssl-certs %endif Requires: perl-base = %{perl_version} -%if %suse_version > 1030 -Recommends: libpurple-lang -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build # Existed before 10.3 and SLED10 before SP2: Obsoletes: gaim <= 1.5.0 @@ -164,17 +162,14 @@ BuildRequires: gconf2-rpm-macros %gconf_schemas_prereq %description -Pidgin allows you to talk to anyone using a variety of messaging -protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, -IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and Zephyr. -These protocols are implemented using a modular, easy to use design. To -use a protocol, just add an account using the account editor. +Pidgin is a chat program which lets you log in to accounts on multiple +chat networks simultaneously. -Pidgin supports many common features of other clients, as well as many -unique features, such as Perl scripting, TCL scripting and C plugins. - -Pidgin is not affiliated with or endorsed by America Online, Inc., -Microsoft Corporation, Yahoo! Inc., or ICQ Inc. +Pidgin is compatible with the following chat networks out of the box: +AIM, ICQ, Google Talk, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, +Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, +SIMPLE, MXit, MySpaceIM, and Zephyr. It can support many more with +plugins. %package devel License: GPLv2+ @@ -185,8 +180,8 @@ Requires: %{name} = %{version} glib2-devel gtk2-devel libpurple-devel = %{ %package -n libpurple License: GPLv2+ -Summary: Library for IM Clients Like Pidgin and Finch -Group: Productivity/Networking/Instant Messenger +Summary: GLib-based Instant Messenger Library +Group: System/Libraries # Not really required, but standard Jabber accounts require it, if compiled with SASL support. Requires: cyrus-sasl-digestmd5 cyrus-sasl-plain # Needed for purple-url-handler: @@ -267,18 +262,39 @@ Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{v Requires: pkg-config Obsoletes: gaim-unstable-text-devel +%if 0%{?suse_version} > 1140 +%package -n libpurple-branding-upstream +License: GPLv2+ +Summary: GLib-based Instant Messenger Library -- Upstream default configuration +Group: System/Libraries +Requires: libpurple = %{version} +Provides: libpurple-branding = %{version} +Conflicts: otherproviders(libpurple-branding) +Supplements: packageand(libpurple:branding-upstream) +# It also provides pidgin branding +Provides: pidgin-branding-upstream = %{version} +Provides: pidgin-branding = %{version} +Conflicts: otherproviders(pidgin-branding) +Supplements: packageand(pidgin:branding-upstream) +BuildArch: noarch +#BRAND: Provides /etc/purple/prefs.xml, the default configuration for +#BRAND: libpurple, and libpurple-based clients. +%endif + %description devel The pidgin-devel package contains the header files, developer documentation, and libraries required for development of Pidgin scripts and plugins. %description -n libpurple -libpurple contains the core IM support for IM clients such as Pidgin -and Finch. +libpurple is a library intended to be used by programmers seeking +to write an IM client that connects to many IM networks. -libpurple supports a variety of messaging protocols including AIM, MSN, -Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, -Lotus Sametime, SILC, Simple and Zephyr. +libpurple is compatible with the following chat networks out of the box: +AIM, ICQ, Google Talk, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, +Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, +SIMPLE, MXit, MySpaceIM, and Zephyr. It can support many more with +plugins. %description -n libpurple-devel The libpurple-devel package contains the header files, developer @@ -316,6 +332,20 @@ The finch-devel package contains the header files, developer documentation, and libraries required for development of Finch scripts and plugins. +%if 0%{?suse_version} > 1140 +%description -n libpurple-branding-upstream +libpurple is a library intended to be used by programmers seeking +to write an IM client that connects to many IM networks. + +libpurple is compatible with the following chat networks out of the box: +AIM, ICQ, Google Talk, Jabber/XMPP, MSN Messenger, Yahoo!, Bonjour, +Gadu-Gadu, IRC, Novell GroupWise Messenger, QQ, Lotus Sametime, SILC, +SIMPLE, MXit, MySpaceIM, and Zephyr. It can support many more with +plugins. + +This package provides the openSUSE default configuration for Pidgin. +%endif + %if %suse_version > 1030 %lang_package -n libpurple %endif @@ -380,6 +410,10 @@ export V=1 %install %{makeinstall} +install -d %{buildroot}%{_sysconfdir}/purple +%if 0%{?suse_version} > 1140 +cp %{SOURCE3} %{buildroot}%{_sysconfdir}/purple/prefs.xml +%endif %{perl_process_packlist} %suse_update_desktop_file -N Pidgin -G "Instant Messenger" %{name} # Provide only upstream emotes in openSUSE >= 11.2 and SLE > 11 (see bnc#569271#c1): @@ -478,6 +512,7 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %files -n libpurple -f %{name}-%{version}-purpleplugins %defattr(-, root, root) %doc libpurple/purple-notifications-example +%dir %{_sysconfdir}/purple/ %{_bindir}/purple-client-example %{_bindir}/purple-remote %{_bindir}/purple-send @@ -582,4 +617,10 @@ find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \ %{_libdir}/pkgconfig/finch.pc %{_libdir}/pkgconfig/gnt.pc +%if 0%{?suse_version} > 1140 +%files -n libpurple-branding-upstream +%defattr(-, root, root) +%{_sysconfdir}/purple/prefs.xml +%endif + %changelog