Author: qboosh Date: Sat Feb 19 19:20:07 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated configure options - libgadu now defaults to gnutls, so updated BR/R (and added openssl bcond)
---- Files affected: packages/libgadu: libgadu.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: packages/libgadu/libgadu.spec diff -u packages/libgadu/libgadu.spec:1.19 packages/libgadu/libgadu.spec:1.20 --- packages/libgadu/libgadu.spec:1.19 Mon Feb 14 18:12:50 2011 +++ packages/libgadu/libgadu.spec Sat Feb 19 20:20:02 2011 @@ -2,8 +2,8 @@ # # Conditional build: %bcond_without pthread # POSIX threads support +%bcond_with openssl # use OpenSSL instead of GnuTLS # - Summary: libgadu library Summary(es.UTF-8): Biblioteca libgadu Summary(pl.UTF-8): Biblioteka libgadu @@ -18,8 +18,9 @@ URL: http://toxygen.net/libgadu/ BuildRequires: autoconf >= 2.50 BuildRequires: automake +%{!?with_openssl:BuildRequires: gnutls-devel} BuildRequires: libtool -BuildRequires: openssl-devel >= 0.9.7d +%{?with_openssl:BuildRequires: openssl-devel >= 0.9.7d} BuildRequires: pkgconfig Obsoletes: libgg BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -46,7 +47,8 @@ Summary(pl.UTF-8): Część biblioteki libgadu dla programistów Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: openssl-devel +%{!?with_openssl:Requires: gnutls-devel} +%{?with_openssl:Requires: openssl-devel} Obsoletes: libgg-devel %description devel @@ -97,10 +99,9 @@ %{__autoheader} %{__automake} %configure \ - --enable-dynamic \ - --enable-shared \ - --enable-static \ + --disable-silent-rules \ --without-bind \ + %{?with_openssl:--without-gnutls} \ %if %{with pthread} --with-pthread \ %else @@ -144,6 +145,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20 2011/02/19 19:20:02 qboosh +- updated configure options +- libgadu now defaults to gnutls, so updated BR/R (and added openssl bcond) + Revision 1.19 2011/02/14 17:12:50 arekm - up to 1.10 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgadu/libgadu.spec?r1=1.19&r2=1.20&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
