rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.7.2.1

Browse Source 
- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch (fixed
    upstream).
This commit is contained in:
Matthew Barnes 2006-05-17 17:21:50 +00:00
parent 59a721b515
commit 36b2a675ef
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-2.7.1.tar.bz2
evolution-2.7.2.1.tar.bz2

29
evolution-2.7.1-no-gnome-common.patch
View File

@ -1,34 +1,5 @@
--- evolution-2.7.1/configure.in.no-gnome-common 2006-04-24 07:17:07.000000000 -0400
+++ evolution-2.7.1/configure.in 2006-05-12 14:46:29.000000000 -0400
@@ -747,16 +747,24 @@
check_manually="no"
fi
- if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then
- PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes")
+ if test "x${check_manually}" = "xno"; then
+ if `$PKG_CONFIG --exists mozilla-nss`; then
+ PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes")
+ mozilla_nspr="mozilla-nspr"
+ mozilla_nss="mozilla-nss"
+ else
+ if `$PKG_CONFIG --exists nss`; then
+ PKG_CHECK_MODULES(NSS, nss, have_nss="yes")
+ mozilla_nspr="nspr"
+ mozilla_nss="nss"
+ fi
+ fi
if test "x${have_nss}" = "xyes"; then
msg_ssl="yes (Mozilla NSS)"
if test "x$enable_smime" = "xyes"; then
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
msg_smime="yes (Mozilla NSS)"
fi
- mozilla_nspr="nspr"
- mozilla_nss="mozilla-nss"
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir mozilla-nss`",[Define to the full path of mozilla nss library])
@@ -1072,9 +1080,6 @@
dnl *************************
dnl CFLAGS and LIBS and stuff

11
evolution.spec
View File

@ -38,12 +38,12 @@
%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
Name: evolution
Version: 2.7.1
Version: 2.7.2.1
Release: 1
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/
Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org/projects/evolution/
Source: %{name}-%{version}.tar.bz2
# patches pulled from upstream CVS
@ -635,6 +635,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
* Wed May 17 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-1
- Update to 2.7.2.1
- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch
(fixed upstream).
* Fri May 12 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.1-1
- Update to 2.7.1
- Bump evo_major from 2.6 to 2.8

2
sources
View File

@ -1 +1 @@
66ab9e288d916607594a2049006f178c evolution-2.7.1.tar.bz2
9a239d549094daf2ad6892f10d152d4f evolution-2.7.2.1.tar.bz2