Author: nosnilmot
Update of /cvs/pkgs/rpms/pidgin/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14179
Modified Files:
.cvsignore pidgin.spec sources
Log Message:
New upstream bugfix release 2.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 29 Feb 2008 15:43:53 -0000 1.14
+++ .cvsignore 31 Mar 2008 21:37:54 -0000 1.15
@@ -1 +1 @@
-pidgin-2.4.0.tar.bz2
+pidgin-2.4.1.tar.bz2
Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-8/pidgin.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- pidgin.spec 29 Feb 2008 15:43:53 -0000 1.44
+++ pidgin.spec 31 Mar 2008 21:37:54 -0000 1.45
@@ -4,8 +4,6 @@
%define krb_integration 1
# OPTION: gtkspell integration (FC1+)
%define gtkspell_integration 1
-# OPTION: Preferred Applications with gnome-open (FC1+)
-%define gnome_open_integration 1
# OPTION: Evolution 1.5+ integration (FC3+)
%define evolution_integration 1
# OPTION: SILC integration (FC3+)
@@ -26,9 +24,11 @@
%define meanwhile_integration 1
# OPTION: Perl devel separated out (F7+)
%define perl_devel_separated 1
+# OPTION: Perl embed separated out (F9+)
+%define perl_embed_separated 0
Name: pidgin
-Version: 2.4.0
+Version: 2.4.1
Release: 1%{?dist}
License: GPLv2+ and GPLv2 and MIT
# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
@@ -36,7 +36,7 @@
# MIT - Zephyr prpl
Group: Applications/Internet
URL:
http://pidgin.im/
-Source0:
http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
+Source0:
http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
Obsoletes: gaim < 999:1
Provides: gaim = 999:1
ExcludeArch: s390 s390x
@@ -98,12 +98,8 @@
%if %{gtkspell_integration}
BuildRequires: gtkspell-devel, aspell-devel
%endif
-# Preferred Applications (FC1+)
-%if %{gnome_open_integration}
-Requires: libgnome
-%else
-Requires: htmlview
-%endif
+# Preferred Applications (FC6+)
+Requires: xdg-utils
# Evolution integration (FC3+)
%if %{evolution_integration}
BuildRequires: evolution-data-server-devel
@@ -148,6 +144,10 @@
%if %{perl_devel_separated}
BuildRequires: perl-devel
%endif
+# Perl embed separated out (F9+)
+%if %{perl_embed_separated}
+BuildRequires: perl(ExtUtils::Embed)
+%endif
%description
@@ -288,12 +288,8 @@
## Patches 100+: To be Included in Future Upstream
-# If not using gnome-open, then default to htmlview
+# Our preferences
cp %{SOURCE1} prefs.xml
-if [ "%{gnome_open_integration}" == "0" ]; then
- sed -i "s/gnome-open/custom/g" prefs.xml
- sed -i "s/pref name='command' type='string' value=''/pref
name='command' type='string' value='htmlview'/" prefs.xml
-fi
%build
@@ -496,6 +492,16 @@
%changelog
+* Mon Mar 31 2008 Stu Tomlinson <stu(a)nosnilmot.com> 2.4.1-1
+- 2.4.1
+
+* Fri Mar 14 2008 Stu Tomlinson <stu(a)nosnilmot.com> 2.4.0-3
+- BuildRequire perl(ExtUtils::Embed) for perl 5.10
+
+* Fri Mar 14 2008 Stu Tomlinson <stu(a)nosnilmot.com> 2.4.0-2
+- Fix download URL
+- Use xdg-open instead of gnome-open (#388521, Ville Skyttä)
+
* Fri Feb 29 2008 Stu Tomlinson <stu(a)nosnilmot.com> 2.4.0-1
- 2.4.0
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/F-8/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 29 Feb 2008 15:43:53 -0000 1.14
+++ sources 31 Mar 2008 21:37:54 -0000 1.15
@@ -1 +1 @@
-d03ac2695d5b5304f86812ffd6ba0053 pidgin-2.4.0.tar.bz2
+ff015bb8bbdcc6a9b4ac954c355179d7 pidgin-2.4.1.tar.bz2