diff --git a/.abf.yml b/.abf.yml index c364804..45a13a1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,8 +1,2 @@ -removed_sources: - pidgin-2.10.11.tar.bz2: 5e0062b81bdb01300804e12bc0b6a04a91984631 - pidgin-2.10.12.tar.bz2: 4550a447f35b869554c2d7d7bc1c7d84a01ce238 - pidgin-2.10.6.tar.bz2: a0532e7ba2acd205d6a5a4e3624156a980fe3d43 - pidgin-2.10.7.tar.bz2: 01bc06e3a5712dded3ad4a4913ada12a3cd01e15 - pidgin-2.10.9.tar.bz2: f3de8fd94dba1f4c98d5402a02430f9f323e665a sources: - pidgin-2.13.0.tar.bz2: 122f0a48ba63cd7f2bc2962c497df045ce29ef71 + pidgin-2.14.12.tar.bz2: f25ccb245119346764b9042218b23b1c993a923d diff --git a/pidgin.spec b/pidgin.spec index e47234b..b7dc6aa 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -7,7 +7,7 @@ %define libgnt %mklibname gnt %{major} %define develname %mklibname purple -d -%define build_evolution 0 +%define build_evolution 1 %define build_silc 1 %define build_meanwhile 1 %define build_networkmanager 1 @@ -28,12 +28,13 @@ Summary: A GTK+ based multiprotocol instant messaging client Name: pidgin -Version: 2.13.0 +Version: 2.14.12 Release: 1 Group: Networking/Instant messaging License: GPLv2+ -URL: http://www.pidgin.im/ -Source0: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 +URL: https://www.pidgin.im +#Source0: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 +Source0: https://sourceforge.net/projects/pidgin/files/Pidgin/%{version}/%{name}-%{version}.tar.bz2 #gw from Fedora: generate one time passwords Source2: one_time_password.c Patch0: pidgin-2.7.0-smiley.patch @@ -62,15 +63,17 @@ BuildRequires: gettext-devel BuildRequires: krb5-devel BuildRequires: tk-devel BuildRequires: tcl-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig(avahi-glib) BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(gnutls) -BuildRequires: libgcrypt-devel +BuildRequires: %{_lib}gcrypt-devel BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gtk+-2.0) Buildrequires: pkgconfig(gtkspell-2.0) >= 2.0.2 +BuildRequires: pkgconfig(gnt) >= 2.14 BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libidn) @@ -89,7 +92,7 @@ BuildRequires: pkgconfig(x11) Buildrequires: pkgconfig(libgadu) >= 1.11.0 %endif %if %build_networkmanager -Buildrequires: pkgconfig(libnm-util) +Buildrequires: pkgconfig(libnm) %endif %if %build_meanwhile BuildRequires: pkgconfig(meanwhile) >= 1.0.0 @@ -110,9 +113,10 @@ BuildRequires: perl-devel BuildRequires: pkgconfig(mono) %endif %if %build_vv -BuildRequires: pkgconfig(farstream-0.1) +BuildRequires: pkgconfig(farstream-0.2) Suggests: gstreamer0.10-farstream %endif +#BuildRequires: pkgconfig(gnt) >= 2.14.0 Requires: %{name}-i18n = %{version}-%{release} Requires: %{name}-plugins = %{version}-%{release} @@ -219,14 +223,14 @@ libgnt 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 -n finch +%package finch Summary: A text-based user interface for Pidgin Group: Networking/Instant messaging Requires: %{name}-i18n >= %{version}-%{release} Requires: %{name}-plugins >= %{version}-%{release} Requires: %{name}-client >= %{version}-%{release} -%description -n finch +%description 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 @@ -289,6 +293,7 @@ autoreconf -fi -Im4macros %build %configure2_5x \ --enable-gnutls=yes \ + --enable-consoleui \ %if %build_perl --enable-perl \ %else @@ -306,6 +311,8 @@ autoreconf -fi -Im4macros %endif %if %build_evolution --enable-gevolution \ +%else + --disable-gevolution \ %endif %if ! %build_vv --disable-vv \ @@ -331,6 +338,9 @@ rm -rf %{buildroot} install -m 0755 libpurple/plugins/one_time_password.so %{buildroot}%{_libdir}/purple-2/ +# rename finch, conflict finch project +mv %{buildroot}%{_bindir}/finch %{buildroot}%{_bindir}/pidgin-finch + desktop-file-install \ --remove-category="Application" \ --add-category="GTK" \ @@ -338,6 +348,7 @@ desktop-file-install \ --add-category="InstantMessaging" \ --dir %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/* + # remove files not bundled rm -f %{buildroot}%{_libdir}/*/*.la rm -f %{buildroot}%{_prefix}/*/perl5/*/perllocal.pod \ @@ -393,7 +404,7 @@ rm -f %{buildroot}%{_libdir}/*.*a %{_datadir}/aclocal/purple.m4 %{_libdir}/pkgconfig/*.pc %{_libdir}/libpurple.so -%{_libdir}/libgnt.so +#{_libdir}/libgnt.so %{_libdir}/libpurple-client.so %files -n %{libname} @@ -402,8 +413,8 @@ rm -f %{buildroot}%{_libdir}/*.*a %files -n %{libclient} %{_libdir}/libpurple-client.so.%{major}* -%files -n %{libgnt} -%{_libdir}/libgnt.so.%{major}* +#files -n %{libgnt} +#{_libdir}/libgnt.so.%{major}* %files client %{_bindir}/purple-remote @@ -413,11 +424,13 @@ rm -f %{buildroot}%{_libdir}/*.*a %{_bindir}/purple-url-handler %{_libdir}/purple-2/dbus-example.so -%files -n finch -%doc %{_mandir}/man1/finch.* -%{_bindir}/finch +%files finch +#doc %{_mandir}/man1/finch.* +%{_bindir}/pidgin-finch %{_libdir}/finch/ -%{_libdir}/gnt/ +%{_mandir}/man1/finch* + +#{_libdir}/gnt/ %if %build_perl %files perl @@ -471,21 +484,21 @@ rm -f %{buildroot}%{_libdir}/*.*a %{_libdir}/purple-2/buddynote.so %{_libdir}/purple-2/idle.so %{_libdir}/purple-2/joinpart.so -%{_libdir}/purple-2/libaim.so +#{_libdir}/purple-2/libaim.so %{_libdir}/purple-2/libgg.so -%{_libdir}/purple-2/libicq.so +#{_libdir}/purple-2/libicq.so %{_libdir}/purple-2/libirc.so %{_libdir}/purple-2/libjabber.so* -%{_libdir}/purple-2/libmsn.so -%{_libdir}/purple-2/libmxit.so -%{_libdir}/purple-2/libmyspace.so +#{_libdir}/purple-2/libmsn.so +#{_libdir}/purple-2/libmxit.so +#{_libdir}/purple-2/libmyspace.so %{_libdir}/purple-2/libnovell.so -%{_libdir}/purple-2/liboscar.so* +#{_libdir}/purple-2/liboscar.so* %{_libdir}/purple-2/libsimple.so %{_libdir}/purple-2/libxmpp.so -%{_libdir}/purple-2/libymsg.so* -%{_libdir}/purple-2/libyahoo.so -%{_libdir}/purple-2/libyahoojp.so +#{_libdir}/purple-2/libymsg.so* +#{_libdir}/purple-2/libyahoo.so +#{_libdir}/purple-2/libyahoojp.so %{_libdir}/purple-2/libzephyr.so %{_libdir}/purple-2/log_reader.so %{_libdir}/purple-2/newline.so @@ -497,10 +510,11 @@ rm -f %{buildroot}%{_libdir}/*.*a %{_libdir}/purple-2/ssl.so %{_libdir}/purple-2/statenotify.so %{_libdir}/purple-2/nss-prefs.so -%dir %{_datadir}/purple/ -%dir %{_datadir}/purple/ca-certs -%{_datadir}/purple/ca-certs/AOL* -%{_datadir}/purple/ca-certs/Microsoft* -%{_datadir}/purple/ca-certs/VeriSign* -%{_datadir}/purple/ca-certs/DigiCert* -%{_datadir}/appdata/pidgin.appdata.xml \ No newline at end of file +#dir %{_datadir}/purple/ +#dir %{_datadir}/purple/ca-certs +#{_datadir}/purple/ca-certs/AOL* +#{_datadir}/purple/ca-certs/Microsoft* +#{_datadir}/purple/ca-certs/VeriSign* +#{_datadir}/purple/ca-certs/DigiCert* +%{_datadir}/metainfo/pidgin.appdata.xml +