Author: glen Date: Tue Aug 26 23:10:00 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- force nss (gnutls also possible) as openssl is not capable for msn encrypt
- networkmanager bcond
- dot and devhelp for docs
---- Files affected:
SPECS:
pidgin.spec (1.217 -> 1.218)
---- Diffs:
================================================================
Index: SPECS/pidgin.spec
diff -u SPECS/pidgin.spec:1.217 SPECS/pidgin.spec:1.218
--- SPECS/pidgin.spec:1.217 Tue Aug 26 18:40:49 2008
+++ SPECS/pidgin.spec Wed Aug 27 01:09:55 2008
@@ -12,7 +12,7 @@
# - add NetworkManager support
#
%bcond_without cap # without Contact Availability Prediction
-%bcond_without dbus # without dbus (for pidgin-remote and others)
+%bcond_without dbus # without D-BUS (for pidgin-remote and others)
%bcond_without doc # do not generate and include documentation
%bcond_with dotnet # build with mono support
%bcond_without evolution # compile without the Pidgin-Evolution plugin
@@ -21,6 +21,11 @@
%bcond_without sasl # disable SASL support
%bcond_without text # don't build text UI
%bcond_without silc # Build without SILC libraries
+%bcond_without nm # NetworkManager support
(requires D-Bus)
+
+%if %{without dbus}
+%undefine with_nm
+%endif
# plain i386 is not supported; mono uses cmpxchg/xadd which require i486
%ifarch i386
@@ -35,7 +40,7 @@
Summary(pt_BR.UTF-8): Um cliente para o AOL Instant Messenger (AIM)
Name: pidgin
Version: 2.5.0
-Release: 1
+Release: 2
License: GPL
Group: Applications/Communications
Source0: http://dl.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
@@ -46,10 +51,12 @@
Patch3: %{name}-autoconf.patch
URL: http://www.pidgin.im/
BuildRequires: GConf2-devel >= 2.16.0
+%{?with_nm:BuildRequires: NetworkManager-devel}
BuildRequires: audiofile-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: avahi-devel
+BuildRequires: nss-devel
BuildRequires: bind-devel
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
%{?with_dbus:BuildRequires: dbus-glib-devel >= 0.71}
@@ -250,14 +257,17 @@
%{__autoconf}
%{__automake}
%configure \
+ --disable-gnutls \
--disable-nas \
- --enable-nss=no \
+ --enable-nss \
+ %{?with_doc:--enable-dot --enable-devhelp} \
--with-perl-lib=vendor \
%{!?with_silc:--with-silc-includes=not_existent_directory} \
--%{?with_cap:en}%{!?with_cap:dis}able-cap \
%{?with_sasl:--enable-cyrus-sasl} \
%{?with_dbus:--enable-dbus
--with-dbus-session-dir=%{_datadir}/dbus-1/services} \
%{!?with_dbus:--disable-dbus} \
+ --%{?with_nm:en}%{!?with_nm:dis}able-nm \
--%{?with_evolution:en}%{!?with_evolution:dis}able-gevolution \
%{!?with_gtkspell:--disable-gtkspell} \
%{?with_dotnet:--enable-mono} \
@@ -356,7 +366,7 @@
%attr(755,root,root) %{_libdir}/purple-2/libqq.so
%attr(755,root,root) %{_libdir}/purple-2/libjabber.so
%attr(755,root,root) %{_libdir}/purple-2/liboscar.so
-
+
%{?with_meanwhile:%attr(755,root,root) %{_libdir}/purple-2/libsametime.so}
%{?with_silc:%attr(755,root,root) %{_libdir}/purple-2/libsilcpurple.so}
%attr(755,root,root) %{_libdir}/purple-2/libsimple.so
@@ -465,6 +475,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.218 2008/08/26 23:09:55 glen
+- force nss (gnutls also possible) as openssl is not capable for msn encrypt
+- networkmanager bcond
+- dot and devhelp for docs
+
Revision 1.217 2008/08/26 16:40:49 rotom
- up to 2.5.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pidgin.spec?r1=1.217&r2=1.218&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
