Attachment 302627 Details for Bug 442671 – There's a patch to evo.spec file for the system nss/nspr packages.

[patch] There's a patch to evo.spec file for the system nss/nspr packages.

evo-system-nss.patch (text/plain), 1.96 KB, created by Martin Stransky on 2008-04-16 15:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2008-04-16 15:50:02 UTC

Size: 1.96 KB

patch

obsolete

>--- evolution.spec.old	2008-04-16 10:41:55.000000000 +0200
>+++ evolution.spec	2008-04-16 11:22:45.000000000 +0200
>@@ -6,5 +6,5 @@
> %define soup_version 2.2.0
> %define eds_version 1.0.2
>-%define use_seamonkey_nss 1
>+%define use_nss 1
> %define evo_major 2.0
> %define libbonoboui_version 2.4.2
>@@ -12,6 +12,6 @@
> %define gnome_icon_theme_version 1.3.6
> 
>-%if %{use_seamonkey_nss}
>-%define seamonkey_build_version 1.0.9
>+%if %{use_nss}
>+%define nss_build_version 3.11.99
> %endif
> 
>@@ -151,7 +151,7 @@
> BuildRequires: gnutls-devel
> 
>-%if %{use_seamonkey_nss}
>-BuildRequires: seamonkey-nspr-devel >= %{seamonkey_build_version}
>-BuildRequires: seamonkey-nss-devel  >= %{seamonkey_build_version}
>+%if %{use_nss}
>+BuildRequires: nspr-devel >= %{nss_build_version}
>+BuildRequires: nss-devel  >= %{nss_build_version}
> %else
> BuildRequires: openssl-devel
>@@ -279,13 +279,13 @@
> %endif
> 
>-%if %{use_seamonkey_nss}
>-%define ssl_flags --with-nspr-includes=/usr/include/mozilla-seamonkey-%{seamonkey_build_version}/nspr --with-nspr-libs=%{_libdir} --with-nss-includes=/usr/include/mozilla-seamonkey-%{seamonkey_build_version}/nss --with-nss-libs=%{_libdir}
>+%if %{use_nss}
>+%define ssl_flags --with-nspr-includes="`pkg-config --cflags nspr`" --with-nspr-libs="`pkg-config --libs nspr`" --with-nss-includes="`pkg-config --cflags nss`" --with-nss-libs="`pkg-config --libs nss`"
> %else
> %define ssl_flags --enable-openssl=yes
> %endif
> 
>-%if %{use_seamonkey_nss}
>-if [ ! -f /usr/include/mozilla-seamonkey-%{seamonkey_build_version}/nspr/nspr.h ]; then
>-  echo "Unable to find suitable version of seamonkey nss to use!"
>+%if %{use_nss}
>+if [ pkg-config --exists "nss >= %{nss_build_version}" ]; then
>+  echo "Unable to find suitable version of nss to use!"
>   exit 1
> fi
>@@ -294,5 +294,5 @@
> CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
> CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et"; export CFLAGS
>-%if ! %{use_seamonkey_nss}
>+%if ! %{use_nss}
> if pkg-config openssl ; then
> 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"

Actions: View | Diff

Attachments on bug 442671: 302627