packages: pidgin/pidgin.spec - use system ca-certificates - include rpm rel...

[glen]

Author: glen                         Date: Sun Dec  5 21:21:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system ca-certificates
- include rpm release in about dialog
- --disable-schemas-install

---- Files affected:
packages/pidgin:
   pidgin.spec (1.275 -> 1.276) 

---- Diffs:

================================================================
Index: packages/pidgin/pidgin.spec
diff -u packages/pidgin/pidgin.spec:1.275 packages/pidgin/pidgin.spec:1.276
--- packages/pidgin/pidgin.spec:1.275	Wed Nov 24 17:22:54 2010
+++ packages/pidgin/pidgin.spec	Sun Dec  5 22:21:32 2010
@@ -49,7 +49,7 @@
 Summary(pt_BR.UTF-8):	Um cliente para o AOL Instant Messenger (AIM)
 Name:		pidgin
 Version:	2.7.7
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2
@@ -85,6 +85,7 @@
 %{?with_dotnet:BuildRequires:	mono-csharp}
 %{?with_dotnet:BuildRequires:	mono-devel}
 %{?with_text:BuildRequires:	ncurses-ext-devel}
+BuildRequires:	rpm >= 4.4.9-56
 %if %{without gnutls}
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
@@ -123,13 +124,20 @@
 Obsoletes:	gaim-plugin-xmms-remote
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# keep in sync ca-certificates
+%if "%{pld_release}" == "th"
+%define		openssldir	/etc/openssl/certs
+%else
+%define		openssldir	/var/lib/openssl/certs
+%endif
+
 # /usr/bin/ld: gntaccount.o: undefined reference to symbol 'cur_term'
 # /usr/bin/ld: note: 'cur_term' is defined in DSO /lib64/libtinfow.so.6 so try adding it to the linker command line
 # /lib64/libtinfow.so.6: could not read symbols: Invalid operation
 %define		filterout_ld	-Wl,--no-copy-dt-needed-entries
 
 # lots of purple and libxml syms
-%define         skip_post_check_so      libjabber.so.0 libymsg.so.0 liboscar.so.0
+%define		skip_post_check_so	libjabber.so.0 libymsg.so.0 liboscar.so.0
 
 %description
 Pidgin allows you to talk to anyone using a variety of messaging
@@ -200,6 +208,7 @@
 %package -n libpurple
 Summary:	libpurple library for IM clients like Pidgin and Finch
 Group:		Applications/Networking
+Requires:	ca-certificates
 %{?with_sasl:Requires:	cyrus-sasl-digest-md5}
 %{?with_sasl:Requires:	cyrus-sasl-plain}
 Requires:	glib2 >= 1:%{glib2_ver}
@@ -522,6 +531,9 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	--with-extraversion=%{release} \
+	--with-system-ssl-certs=%{openssldir} \
+	--disable-schemas-install \
 	%{!?with_gnutls:--enable-gnutls=no} \
 	%{?with_gnutls:--enable-nss=no} \
 	%{?with_doc:--enable-dot --enable-devhelp} \
@@ -677,7 +689,7 @@
 %endif
 
 %{_datadir}/sounds/purple
-%{_datadir}/purple
+%dir %{_datadir}/purple
 %if %{with dbus}
 %attr(755,root,root) %{_bindir}/purple-send
 %attr(755,root,root) %{_bindir}/purple-send-async
@@ -853,6 +865,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.276  2010/12/05 21:21:32  glen
+- use system ca-certificates
+- include rpm release in about dialog
+- --disable-schemas-install
+
 Revision 1.275  2010/11/24 16:22:54  glen
 - up to 2.7.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pidgin/pidgin.spec?r1=1.275&r2=1.276&f=u