[meego-commits] 6046: Changes to Trunk:Testing/pidgin

Jian-feng Ding jian-feng.ding at intel.com
Wed Jul 28 09:38:48 UTC 2010


Hi,
I have made the following changes to pidgin in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Jian-feng Ding

[This message was auto-generated]

---

Request #6046:

  submit:   home:jfding:branches:Trunk:Testing/pidgin(r4)(cleanup) -> Trunk:Testing/pidgin


Message:
    Update to 2.7.2 to fix several CVE issues and cleanup fedora stuff with spectacle enabling

State:   new          2010-07-27T21:31:41 jfding
Comment: None



changes files:
--------------
--- pidgin.changes
+++ pidgin.changes
@@ -0,0 +1,4 @@
+* Wed Jul 28 2010 Jian-feng Ding <jian-feng.ding at intel.com> 2.7.2
+- Update to 2.7.2 to fix several CVE issues
+  And cleanup fedora stuff with spectacle enabling
+

old:
----
  pidgin-2.6.6.tar.bz2
  pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
  purple-fedora-prefs.xml

new:
----
  pidgin-2.7.2.tar.bz2
  pidgin.yaml

spec files:
-----------
--- pidgin.spec
+++ pidgin.spec
@@ -1,17 +1,10 @@
-
-# Define variables to use in conditionals
-%define dbus_integration        0
-%define gstreamer_integration	0
+# 
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
+# 
+# >> macros
 %define vv_support		1
 %define nm_integration		0
-%define modular_x		0
-%define dbus_glib_splt		0
-%define bonjour_support		0
-%define meanwhile_integration	0
-%define perl_devel_separated	0
-%define perl_embed_separated	0
-%define api_docs		0
-
 %define dbus_integration	1
 %define gstreamer_integration	1
 %define modular_x		1
@@ -22,100 +15,58 @@
 %define perl_embed_separated	1
 %define api_docs		0
 
+%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+# << macros
+
 Name:		pidgin
-Version:	2.6.6
+Summary:    A Gtk+ based multiprotocol instant messaging client
+Version:    2.7.2
 Release:	1
-License:        GPLv2+ and GPLv2 and MIT
-# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
-# GPLv2 - silc & novell prpls
-# MIT - Zephyr prpl
 Group:		Applications/Internet
+License:    GPLv2+ and GPLv2 and MIT
 URL:		http://pidgin.im/
 Source0:	http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
-
-## Fedora pidgin defaults
-# Only needs regenerating if Pidgin breaks backwards compatibility with prefs.xml
-# 1) uninstall any non-default pidgin or libpurple plugins
-# 2) run pidgin as new user 3) edit preferences 4) close 5) copy .purple/prefs.xml
-# OR 1) edit manually
-# - enable ExtPlacement plugin
-# - enable History plugin
-# - enable Message Notification plugin
-#   Insert count of new messages into window title
-#   Set window manager "URGENT" hint
-# - disable buddy icon in buddy list
-# - enable Logging (in HTML)
-# - Browser "GNOME Default"
-# - Smiley Theme "Default"
-Source1:	purple-fedora-prefs.xml
-Source2:        one_time_password.c
-Source101: pidgin-rpmlintrc
-
-
-## Patches 0-99: Fedora specific or upstream wont accept
+Source1:    one_time_password.c
+Source100:  pidgin.yaml
 Patch0: pidgin-NOT-UPSTREAM-2.6.1-reread-resolvconf.patch
-Patch1: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
-
-## Patches 100+: To be Included in Future Upstream
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Summary:	A Gtk+ based multiprotocol instant messaging client
-
-# Require Binary Compatible glib
-# returns bogus value if glib2-devel is not installed in order for parsing to succeed
-# bogus value wont make it into a real package
-%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
-BuildRequires:	glib2-devel
 Requires:       glib2 >= %{glib_ver}
-# Require exact libpurple
 Requires:       libpurple = %{version}-%{release}
-
+Requires:   xdg-utils
 Requires(pre):  GConf2
-Requires(post): GConf2
 Requires(preun): GConf2
-
-# Basic Library Requirements
-BuildRequires:	startup-notification-devel
+Requires(post): GConf2
+Requires(post): /bin/touch
+Requires(post): gtk2
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(gtkspell-2.0)
+BuildRequires:  pkgconfig(aspell)
+BuildRequires:  pkgconfig(silc)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(avahi-glib)
+BuildRequires:  pkgconfig(libidn)
+BuildRequires:  pkgconfig(farsight2-0.10)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(libstartup-notification-1.0)
+BuildRequires:  pkgconfig(nss)
+BuildRequires:  glib2-devel
 BuildRequires:  cyrus-sasl-devel
-BuildRequires:	nss-devel
 BuildRequires:	gtk2-devel
 BuildRequires:  gettext
 BuildRequires:  intltool
-BuildRequires:  desktop-file-utils
 BuildRequires:  ncurses-devel
-BuildRequires:  libxml2-devel
-BuildRequires: pkgconfig(xscrnsaver)
-
-# krb5 needed for Zephyr 
 BuildRequires:	krb5-devel
-# gtkspell integration 
-BuildRequires:	gtkspell-devel, aspell-devel
-# Evolution integration 
 BuildRequires:	evolution-data-server-devel
-# SILC integration 
-BuildRequires:	libsilc-devel
-BuildRequires:  dbus-devel >= 0.60
 BuildRequires:  python     >= 2.4
 BuildRequires:	gstreamer-devel >= 0.10
-BuildRequires:  libSM-devel
-BuildRequires:  libXScrnSaver-devel
-Requires:	xdg-utils
-BuildRequires:  dbus-glib-devel >= 0.70
-BuildRequires:	avahi-glib-devel
-# Perl devel separated out (F7+)
 BuildRequires:  perl-devel
 BuildRequires:  perl(ExtUtils::Embed)
+BuildRequires:  desktop-file-utils
 
-BuildRequires:  libidn-devel
-
-# Voice and video support (F11+)
-%if %{vv_support}
-BuildRequires:  farsight2-devel
-%endif
-
-%if %{api_docs}
-BuildRequires: doxygen
-%endif
 
 %description
 Pidgin allows you to talk to anyone using a variety of messaging
@@ -132,38 +83,11 @@
 Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
 
 
-%package devel
-Summary: Development headers and libraries for pidgin
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libpurple-devel = %{version}-%{release}
-Requires: pkgconfig
-Requires: gtk2-devel
-Obsoletes: gaim-devel
-Provides:  gaim-devel = %{version}-%{release}
-
-
-%description devel
-The pidgin-devel package contains the header files, developer
-documentation, and libraries required for development of Pidgin scripts
-and plugins.
-
-%package -n finch
-Summary:    A text-based user interface for Pidgin
-Group:      Applications/Internet
-Requires:   glib2 >= %{glib_ver}
-Requires:   libpurple = %{version}-%{release}
-
-%description -n finch
-A text-based user interface for using libpurple.  This can be run from a
-standard text console or from a terminal within X Windows.  It
-uses ncurses and our homegrown gnt library for drawing windows
-and text.
-
 
 %package -n finch-devel
 Summary:    Headers etc. for finch stuffs
 Group:      Applications/Internet
+Requires:   %{name} = %{version}-%{release}
 Requires:   finch = %{version}-%{release}
 Requires:   libpurple-devel = %{version}-%{release}
 Requires:   pkgconfig
@@ -174,9 +98,23 @@
 documentation, and libraries required for development of Finch scripts
 and plugins.
 
+
+%package -n libpurple-perl
+Summary:    Perl scripting support for libpurple
+Group:      Applications/Internet
+Requires:   %{name} = %{version}-%{release}
+Requires:   libpurple = %{version}-%{release}
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description -n libpurple-perl
+Perl plugin loader for libpurple. This package will allow you to write or
+use libpurple plugins written in the Perl programming language.
+
+
 %package perl
 Summary:    Perl scripting support for Pidgin
 Group:      Applications/Internet
+Requires:   %{name} = %{version}-%{release}
 Requires:   libpurple = %{version}-%{release}
 Requires:   libpurple-perl = %{version}-%{release}
 
@@ -185,26 +123,42 @@
 use Pidgin plugins written in the Perl programming language.
 
 
-%package -n libpurple
-Summary:    The libpurple library for IM clients like Pidgin and Finch
+%package -n finch
+Summary:    A text-based user interface for Pidgin
 Group:      Applications/Internet
-# Ensure elimination of gaim.i386 on x86_64
+Requires:   %{name} = %{version}-%{release}
 Requires:   glib2 >= %{glib_ver}
-# Bug #212817 Jabber needs cyrus-sasl plugins for authentication
-Requires: cyrus-sasl-plain, cyrus-sasl-md5
+Requires:   libpurple = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
-%description -n libpurple
-libpurple contains the core IM support for IM clients such as Pidgin
-and Finch.
+%description -n finch
+A text-based user interface for using libpurple.  This can be run from a
+standard text console or from a terminal within X Windows.  It
+uses ncurses and our homegrown gnt library for drawing windows
+and text.
 
-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.
+
+%package devel
+Summary:    Development headers and libraries for pidgin
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   libpurple-devel = %{version}-%{release}
+Requires:   pkgconfig
+Requires:   gtk2-devel
+Provides:   gaim-devel = %{version}-%{release}
+Obsoletes:   gaim-devel
+
+%description devel
+The pidgin-devel package contains the header files, developer
+documentation, and libraries required for development of Pidgin scripts
+and plugins.
 
 
 %package -n libpurple-devel
 Summary:    Development headers, documentation, and libraries for libpurple
 Group:      Applications/Internet
+Requires:   %{name} = %{version}-%{release}
 Requires:   libpurple = %{version}-%{release}
 Requires:   pkgconfig
 Requires:   dbus-devel >= 0.60
@@ -215,64 +169,73 @@
 documentation, and libraries required for development of libpurple based
 instant messaging clients or plugins for any libpurple based client.
 
-%package -n libpurple-perl
-Summary:    Perl scripting support for libpurple
+
+%package -n libpurple
+Summary:    libpurple library for IM clients like Pidgin and Finch
 Group:      Applications/Internet
-Requires:   libpurple = %{version}-%{release}
-Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   %{name} = %{version}-%{release}
+Requires:   glib2 >= %{glib_ver}
+Requires:   cyrus-sasl-plain
+Requires:   cyrus-sasl-md5
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
-%description -n libpurple-perl
-Perl plugin loader for libpurple. This package will allow you to write or
-use libpurple plugins written in the Perl programming language.
+%description -n libpurple
+libpurple contains the core IM support for IM clients such as Pidgin
+and Finch.
 
+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.
 
 
 
 %prep
-%setup -q
-## Patches 0-99: Fedora specific or upstream wont accept
-%patch0 -p1 -b .resolv
+%setup -q -n %{name}-%{version}
 
-## Patches 100+: To be Included in Future Upstream
-
-# Our preferences
-cp %{SOURCE1} prefs.xml
+# pidgin-NOT-UPSTREAM-2.6.1-reread-resolvconf.patch
+%patch0 -p1
+# >> setup
+# << setup
 
 %build
+# >> build pre
 SWITCHES="--with-extraversion=%{release}"
-	SWITCHES="$SWITCHES --enable-perl"
-	SWITCHES="$SWITCHES --disable-gevolution"
-	SWITCHES="$SWITCHES --enable-dbus"
-	SWITCHES="$SWITCHES --enable-gstreamer"
-	SWITCHES="$SWITCHES --disable-meanwhile --disable-nm"
-
+SWITCHES="$SWITCHES --enable-perl"
+SWITCHES="$SWITCHES --disable-gevolution"
+SWITCHES="$SWITCHES --enable-dbus"
+SWITCHES="$SWITCHES --enable-gstreamer"
+SWITCHES="$SWITCHES --disable-meanwhile --disable-nm"
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
 export CFLAGS="$RPM_OPT_FLAGS"
+# << build pre
 
-# gnutls is buggy so use mozilla-nss on all distributions
-%configure --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl --disable-tcl \
-           --disable-schemas-install $SWITCHES
+%configure --disable-static \
+    --enable-gnutls=no \
+    --enable-nss=yes \
+    --enable-cyrus-sasl \
+    --disable-tcl \
+    --disable-schemas-install \
+    $SWITCHES
 
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+make %{?jobs:-j%jobs}
 
-# one_time_password plugin, to be merged upstream soon
-cp %{SOURCE2} libpurple/plugins/
+# >> build post
+cp %{SOURCE1} libpurple/plugins/
 cd libpurple/plugins/
 make one_time_password.so
 cd -
-
-
+# << build post
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install LIBTOOL=/usr/bin/libtool
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install 
 
-install -m 0755 libpurple/plugins/one_time_password.so $RPM_BUILD_ROOT%{_libdir}/purple-2/
+# >> install post
+#make DESTDIR=$RPM_BUILD_ROOT install LIBTOOL=/usr/bin/libtool
 
-desktop-file-install --vendor pidgin --delete-original       \
-  --add-category X-Red-Hat-Base                            \
-  --copy-generic-name-to-name                              \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
-  $RPM_BUILD_ROOT%{_datadir}/applications/pidgin.desktop
+install -m 0755 libpurple/plugins/one_time_password.so $RPM_BUILD_ROOT%{_libdir}/purple-2/
 
 # remove libtool libraries and static libraries
 rm -f `find $RPM_BUILD_ROOT -name "*.la" -o -name "*.a"`
@@ -282,9 +245,8 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/relnot.so
 # remove dummy nullclient
 rm -f $RPM_BUILD_ROOT%{_bindir}/nullclient
-# install Fedora pidgin default prefs.xml
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/purple/
-install -m 644 prefs.xml $RPM_BUILD_ROOT%{_sysconfdir}/purple/prefs.xml
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
@@ -293,54 +255,75 @@
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-%find_lang pidgin
-
 # symlink /usr/bin/gaim to new pidgin name
 ln -sf pidgin $RPM_BUILD_ROOT%{_bindir}/gaim
 
+# << install post
+desktop-file-install --delete-original       \
+  --dir %{buildroot}%{_datadir}/applications             \
+   %{buildroot}%{_datadir}/applications/*.desktop
+%find_lang pidgin
+
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-                %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
-    killall -HUP gconfd-2 &> /dev/null || :
+    %{_sysconfdir}/gconf/schemas/purple.schemas \
+    > /dev/null || :
 fi
 
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-[ -x %{_bindir}/gtk-update-icon-cache ] && \
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-            %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-killall -HUP gconfd-2 &> /dev/null || :
-
-%post -n libpurple -p /sbin/ldconfig
-
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
-                %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-    killall -HUP gconfd-2 &> /dev/null || :
+    %{_sysconfdir}/gconf/schemas/purple.schemas \
+    > /dev/null || :
 fi
 
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+    %{_sysconfdir}/gconf/schemas/purple.schemas  > /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+  --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-[ -x %{_bindir}/gtk-update-icon-cache ] && \
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+  --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+
+
+
+
+
+
+
+
+
 
-%postun -n libpurple -p /sbin/ldconfig
 
 %post -n finch -p /sbin/ldconfig
 
 %postun -n finch -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
-%files
+
+
+
+
+
+
+%post -n libpurple -p /sbin/ldconfig
+
+%postun -n libpurple -p /sbin/ldconfig
+
+%files -f pidgin.lang
 %defattr(-,root,root,-)
+# >> files
 %doc NEWS COPYING AUTHORS README ChangeLog doc/PERL-HOWTO.dox
 %{_bindir}/pidgin
 %{_bindir}/gaim
@@ -350,19 +333,66 @@
 %{_datadir}/pixmaps/pidgin/
 %{_datadir}/icons/hicolor/*/apps/pidgin.*
 %{_sysconfdir}/gconf/schemas/purple.schemas
+# << files
+
+
+%files -n finch-devel
+%defattr(-,root,root,-)
+# >> files finch-devel
+%{_includedir}/finch/
+%{_includedir}/gnt/
+%{_libdir}/libgnt.so
+%{_libdir}/pkgconfig/gnt.pc
+%{_libdir}/pkgconfig/finch.pc
+# << files finch-devel
+
+%files -n libpurple-perl
+%defattr(-,root,root,-)
+# >> files libpurple-perl
+%{_mandir}/man3/Purple*
+%{_libdir}/purple-2/perl.so
+%{_libdir}/purple-2/perl/
+# << files libpurple-perl
 
 %files perl
 %defattr(-,root,root,-)
+# >> files perl
 %{_mandir}/man3/Pidgin*
 %{_libdir}/pidgin/perl/
+# << files perl
+
+%files -n finch
+%defattr(-,root,root,-)
+# >> files finch
+%{_bindir}/finch
+%{_libdir}/finch/
+%{_libdir}/gnt/
+%{_libdir}/libgnt.so.*
+%{_mandir}/man1/finch.*
+# << files finch
 
 %files devel
 %defattr(-,root,root,-)
+# >> files devel
 %{_includedir}/pidgin/
 %{_libdir}/pkgconfig/pidgin.pc
+# << files devel
+
+%files -n libpurple-devel
+%defattr(-,root,root,-)
+# >> files libpurple-devel
+%{_datadir}/aclocal/purple.m4
+%{_libdir}/libpurple.so
+%{_includedir}/libpurple/
+%{_libdir}/pkgconfig/purple.pc
+%if %{dbus_integration}
+%{_libdir}/libpurple-client.so
+%endif
+# << files libpurple-devel
 
-%files -f pidgin.lang -n libpurple
+%files -n libpurple
 %defattr(-,root,root,-)
+# >> files libpurple
 %{_libdir}/purple-2/
 %{_libdir}/libpurple.so.*
 %{_datadir}/sounds/purple/
@@ -379,35 +409,5 @@
 %doc libpurple/purple-notifications-example
 %endif
 %exclude %{_libdir}/purple-2/perl.so
+# << files libpurple
 
-%files -n libpurple-devel
-%defattr(-,root,root,-)
-%{_datadir}/aclocal/purple.m4
-%{_libdir}/libpurple.so
-%{_includedir}/libpurple/
-%{_libdir}/pkgconfig/purple.pc
-%if %{dbus_integration}
-%{_libdir}/libpurple-client.so
-%endif
-
-%files -n libpurple-perl
-%defattr(-,root,root,-)
-%{_mandir}/man3/Purple*
-%{_libdir}/purple-2/perl.so
-%{_libdir}/purple-2/perl/
-
-%files -n finch
-%defattr(-,root,root,-)
-%{_bindir}/finch
-%{_libdir}/finch/
-%{_libdir}/gnt/
-%{_libdir}/libgnt.so.*
-%{_mandir}/man1/finch.*
-
-%files -n finch-devel
-%defattr(-,root,root,-)
-%{_includedir}/finch/
-%{_includedir}/gnt/
-%{_libdir}/libgnt.so
-%{_libdir}/pkgconfig/gnt.pc
-%{_libdir}/pkgconfig/finch.pc

other changes:
--------------

++++++ pidgin-2.6.6.tar.bz2 -> pidgin-2.7.2.tar.bz2
384626 lines of diff (skipped)

++++++ pidgin.yaml (new)
--- pidgin.yaml
+++ pidgin.yaml
+Name: pidgin
+Summary: A Gtk+ based multiprotocol instant messaging client
+Version: 2.7.2
+Release: 1
+Group: Applications/Internet
+License: GPLv2+ and GPLv2 and MIT
+URL: http://pidgin.im/
+Sources:
+    - http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
+    - one_time_password.c
+Patches:
+    - pidgin-NOT-UPSTREAM-2.6.1-reread-resolvconf.patch
+
+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 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.
+
+Requires:
+    - glib2 >= %{glib_ver}
+    - libpurple = %{version}-%{release}
+    - xdg-utils
+PkgConfigBR:
+    - libxml-2.0
+    - gtkspell-2.0
+    - aspell
+    - silc
+    - dbus-1
+    - sm
+    - xscrnsaver
+    - dbus-glib-1
+    - avahi-glib
+    - libidn
+    - farsight2-0.10
+    - xscrnsaver
+    - libstartup-notification-1.0
+    - nss
+PkgBR:
+    - glib2-devel
+    - cyrus-sasl-devel
+    - gtk2-devel
+    - gettext
+    - intltool
+    - ncurses-devel
+    - krb5-devel
+    - evolution-data-server-devel
+    - python     >= 2.4
+    - gstreamer-devel >= 0.10
+    - perl-devel
+    - perl(ExtUtils::Embed)
+
+Configure: configure
+ConfigOptions:
+    - --enable-gnutls=no
+    - --enable-nss=yes
+    - --enable-cyrus-sasl
+    - --disable-tcl
+    - --disable-schemas-install
+    - $SWITCHES
+Builder: make
+
+LocaleName: pidgin
+UpdateDesktopDB: yes
+
+SubPackages:
+    - Name: finch-devel
+      AsWholeName: yes
+      Summary: Headers etc. for finch stuffs
+      Group: Applications/Internet
+      Description: |
+          The finch-devel package contains the header files, developer
+          documentation, and libraries required for development of Finch scripts
+          and plugins.
+      Requires:
+          - finch = %{version}-%{release}
+          - libpurple-devel = %{version}-%{release}
+          - pkgconfig
+          - ncurses-devel
+
+    - Name: libpurple-perl
+      AsWholeName: yes
+      Summary: Perl scripting support for libpurple
+      Group: Applications/Internet
+      Description: |
+          Perl plugin loader for libpurple. This package will allow you to write or
+          use libpurple plugins written in the Perl programming language.
+      Requires:
+          - libpurple = %{version}-%{release}
+          - perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+    - Name: perl
+      Summary: Perl scripting support for Pidgin
+      Group: Applications/Internet
+      Description: |
+          Perl plugin loader for Pidgin. This package will allow you to write or
+          use Pidgin plugins written in the Perl programming language.
+      Requires:
+          - libpurple = %{version}-%{release}
+          - libpurple-perl = %{version}-%{release}
+
+    - Name: finch
+      AsWholeName: yes
+      Summary: A text-based user interface for Pidgin
+      Group: Applications/Internet
+      Description: |
+          A text-based user interface for using libpurple.  This can be run from a
+          standard text console or from a terminal within X Windows.  It
+          uses ncurses and our homegrown gnt library for drawing windows
+          and text.
+      Requires:
+          - glib2 >= %{glib_ver}
+          - libpurple = %{version}-%{release}
+
+    - Name: devel
+      Summary: Development headers and libraries for pidgin
+      Group: Development/Libraries
+      Description: |
+          The pidgin-devel package contains the header files, developer
+          documentation, and libraries required for development of Pidgin scripts
+          and plugins.
+      Requires:
+          - libpurple-devel = %{version}-%{release}
+          - pkgconfig
+          - gtk2-devel
+      Provides:
+          - gaim-devel = %{version}-%{release}
+      Obsoletes:
+          - gaim-devel
+
+    - Name: libpurple-devel
+      AsWholeName: yes
+      Summary: Development headers, documentation, and libraries for libpurple
+      Group: Applications/Internet
+      Description: |
+          The libpurple-devel package contains the header files, developer
+          documentation, and libraries required for development of libpurple based
+          instant messaging clients or plugins for any libpurple based client.
+      Requires:
+          - libpurple = %{version}-%{release}
+          - pkgconfig
+          - dbus-devel >= 0.60
+          - dbus-glib-devel >= 0.70
+
+    - Name: libpurple
+      AsWholeName: yes
+      Summary: libpurple library for IM clients like Pidgin and Finch
+      Group: Applications/Internet
+      Description: |
+          libpurple contains the core IM support for IM clients such as Pidgin
+          and Finch.
+          
+          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.
+      Requires:
+          - glib2 >= %{glib_ver}
+          - cyrus-sasl-plain
+          - cyrus-sasl-md5
+

++++++ deleted files:
--- pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
--- purple-fedora-prefs.xml



More information about the MeeGo-commits mailing list