Hello community,

here is the log from the commit of package pidgin for openSUSE:Factory
checked in at Fri Jul 8 09:38:13 CEST 2011.



--------
--- GNOME/pidgin/pidgin.changes 2011-07-06 11:16:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/pidgin/pidgin.changes  2011-07-06 
20:43:47.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Jul  6 17:13:47 CEST 2011 - [email protected]
+
+- 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.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  pidgin-prefs.xml

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pidgin.spec ++++++
--- /var/tmp/diff_new_pack.U6ANyv/_old  2011-07-08 09:34:45.000000000 +0200
+++ /var/tmp/diff_new_pack.U6ANyv/_new  2011-07-08 09:34:45.000000000 +0200
@@ -24,15 +24,16 @@
 %endif
 
 Name:           pidgin
-Summary:        GTK+-Based Multiprotocol Instant Messaging Client
+Summary:        Multiprotocol Instant Messaging Client
 Version:        2.9.0
-Release:        4
+Release:        6
 License:        GPLv2+
 Group:          Productivity/Networking/Instant Messenger
 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 @@
 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 @@
 %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 @@
 
 %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,40 @@
 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 +333,21 @@
 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 +412,10 @@
 
 %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 +514,7 @@
 %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 +619,11 @@
 %{_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

++++++ pidgin-prefs.xml ++++++
<?xml version='1.0' encoding='UTF-8' ?>
<!--
  This is the file that will be used to create the default configuration for
  users. The easy way to edit it is to change options in a client like
  pidgin, and copy the relevant parts of ~/.purple/prefs.xml here
-->

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to