[evolution-data-server] Update to 3.11.2 Conditionally build devel documentation Disable compiler warnings about deprecated
Milan Crha
mcrha at fedoraproject.org
Mon Nov 18 07:26:54 UTC 2013
commit ec25f085c1e0e8d0417af82b65f9ab428a553679
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Nov 18 08:26:59 2013 +0100
Update to 3.11.2
Conditionally build devel documentation
Disable compiler warnings about deprecated symbols
.gitignore | 1 +
evolution-data-server.spec | 30 ++++++++++++++++++++++++++----
sources | 2 +-
3 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96d9e46..983372d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ evolution-data-server-2.31.5.tar.bz2
/evolution-data-server-3.10.0.tar.xz
/evolution-data-server-3.10.1.tar.xz
/evolution-data-server-3.11.1.tar.xz
+/evolution-data-server-3.11.2.tar.xz
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 4423b4f..feca4c7 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -4,6 +4,9 @@
%define nntp_support 1
%define largefile_support 1
+# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
+%{!?with_docs: %define with_docs 1}
+
%define glib2_version 2.36.0
%define gtk3_version 3.2.0
%define gcr_version 3.4
@@ -28,7 +31,7 @@
### Abstract ###
Name: evolution-data-server
-Version: 3.11.1
+Version: 3.11.2
Release: 1%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@@ -112,6 +115,8 @@ Requires: sqlite-devel
%description devel
Development files needed for building things which link against %{name}.
+%if %{with_docs}
+
%package doc
Summary: Documentation files for %{name}
Group: Development/Libraries
@@ -120,6 +125,9 @@ BuildArch: noarch
%description doc
This package contains developer documentation for %{name}.
+# %{with_docs}
+%endif
+
%prep
%setup -q
@@ -176,13 +184,19 @@ fi
%define ssl_flags --enable-smime=yes
+%if %{with_docs}
+%define gtkdoc_flags --enable-gtk-doc
+%else
+%define gtkdoc_flags --disable-gtk-doc
+%endif
+
if ! pkg-config --exists nss; then
echo "Unable to find suitable version of nss to use!"
exit 1
fi
export CPPFLAGS="-I%{_includedir}/et"
-export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
+export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-deprecated-declarations"
# Regenerate configure to pick up configure.in and acinclude.m4 changes..
aclocal -I m4
@@ -201,11 +215,10 @@ autoconf
--with-libdb=/usr \
--enable-file-locking=fcntl \
--enable-dot-locking=no \
- --enable-gtk-doc \
--enable-introspection=yes \
--enable-vala-bindings \
%ldap_flags %krb5_flags %nntp_flags %ssl_flags \
- %largefile_flags
+ %largefile_flags %gtkdoc_flags
export tagname=CC
# Do not build in parallel. The libedata-book and libedata-cal directories
@@ -359,6 +372,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/vala/vapi/libedataserver-1.2.deps
%{_datadir}/vala/vapi/libedataserver-1.2.vapi
+%if %{with_docs}
+
%files doc
%defattr(-,root,root,-)
%{_datadir}/gtk-doc/html/camel
@@ -370,7 +385,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/libedata-cal
%{_datadir}/gtk-doc/html/libedataserver
+%endif
+
%changelog
+* Mon Nov 18 2013 Matthew Barnes <mbarnes at redhat.com> - 3.11.2-1
+- Update to 3.11.2
+- Conditionally build devel documentation
+- Disable compiler warnings about deprecated symbols
+
* Tue Oct 22 2013 Matthew Barnes <mbarnes at redhat.com> - 3.11.1-1
- Update to 3.11.1
diff --git a/sources b/sources
index 4701f29..0f00858 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e3245a26784ab81cd20f17b3e0f2c9c evolution-data-server-3.11.1.tar.xz
+4d115d4bced3342e6687e00ba9803a98 evolution-data-server-3.11.2.tar.xz
More information about the scm-commits
mailing list