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

Update to 3.15.92; Remove patch to fix libdb configure.ac check (fixed upstream)

Browse Source
This commit is contained in:
Milan Crha 2015-03-16 12:14:48 +01:00
parent b3f870c25f
commit e5b7a455a6
4 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -80,3 +80,4 @@ evolution-data-server-2.31.5.tar.bz2
/evolution-data-server-3.13.10.tar.xz /evolution-data-server-3.13.10.tar.xz
/evolution-data-server-3.13.90.tar.xz /evolution-data-server-3.13.90.tar.xz
/evolution-data-server-3.15.91.tar.xz /evolution-data-server-3.15.91.tar.xz
/evolution-data-server-3.15.92.tar.xz

28
evolution-data-server-3.15.91-libdb-configure-fix.patch
View File

@ -1,28 +0,0 @@
diff -up evolution-data-server-3.15.91/configure.ac.ttest evolution-data-server-3.15.91/configure.ac
--- evolution-data-server-3.15.91/configure.ac.ttest 2015-03-02 11:48:25.422252070 +0100
+++ evolution-data-server-3.15.91/configure.ac 2015-03-02 11:49:28.947798814 +0100
@@ -634,18 +634,18 @@ AC_ARG_WITH([libdb],
if test "x$with_libdb" != "xno" ; then
if test "x$with_libdb" != "xyes" ; then
- DB_CFLAGS="-I$with_libdb/include"
- DB_LIBS="-L$with_libdb/lib -ldb"
+ DB_CFLAGS="$CFLAGS -I$with_libdb/include"
+ DB_LIBS="$LIBS -L$with_libdb/lib -ldb"
else
if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
- DB_CFLAGS=""
- DB_LIBS="-ldb"
+ DB_CFLAGS="$CFLAGS"
+ DB_LIBS="$LIBS -ldb"
fi
fi
AC_MSG_CHECKING([Berkeley DB])
- save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
- save_libs=$LIBS; LIBS="$DB_LIBS"
+ save_cflags=$CFLAGS; CFLAGS="$CFLAGS $DB_CFLAGS"
+ save_libs=$LIBS; LIBS="$LIBS $DB_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM(
[[#include <db.h>]],
[[db_create(NULL, NULL, 0)]])],

9
evolution-data-server.spec
View File

@ -32,7 +32,7 @@
### Abstract ### ### Abstract ###
Name: evolution-data-server Name: evolution-data-server
Version: 3.15.91 Version: 3.15.92
Release: 1%{?dist} Release: 1%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
@ -54,8 +54,6 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12
# RH bug #243296 # RH bug #243296
Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
Patch02: evolution-data-server-3.15.91-libdb-configure-fix.patch
### Dependencies ### ### Dependencies ###
Requires: dconf Requires: dconf
@ -152,7 +150,6 @@ the functionality of the installed %{name} package.
%setup -q %setup -q
%patch01 -p1 -b .fix-64bit-acinclude %patch01 -p1 -b .fix-64bit-acinclude
%patch02 -p1 -b .libdb-configure-fix
%build %build
%if %{ldap_support} %if %{ldap_support}
@ -413,6 +410,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Mon Mar 16 2015 Milan Crha <mcrha@redhat.com> - 3.15.92-1
- Update to 3.15.92
- Remove patch to fix libdb configure.ac check (fixed upstream)
* Mon Mar 02 2015 Milan Crha <mcrha@redhat.com> - 3.15.91-1 * Mon Mar 02 2015 Milan Crha <mcrha@redhat.com> - 3.15.91-1
- Update to 3.15.91 - Update to 3.15.91
- Add patch to fix libdb configure.ac check - Add patch to fix libdb configure.ac check

2
sources
View File

@ -1 +1 @@
d5bd27ad1b1a16e9e5d88898e50cf2bc evolution-data-server-3.15.91.tar.xz 89bc38a07c56162f6cf25037f35fa52a evolution-data-server-3.15.92.tar.xz